[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       Laurent Montel <montel () kde ! org>
Date:       2010-09-29 15:45:57
Message-ID: 20100929154557.D3914AC891 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1180967 by mlaurent:

Fix Bug 252704 -  Kmail Crashed with insert of image  
processes events which can delete the QMimeData object when we can menu

BUG: 252704


 M  +1 -1      CMakeLists.txt  
 M  +7 -2      kpimtextedit/textedit.cpp  
 M  +5 -2      kpimtextedit/textedit.h  


--- trunk/KDE/kdepimlibs/CMakeLists.txt #1180966:1180967
@@ -7,7 +7,7 @@
 ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) \
###############  set(KDEPIMLIBS_VERSION_MAJOR 4)
 set(KDEPIMLIBS_VERSION_MINOR 5)
-set(KDEPIMLIBS_VERSION_PATCH 61)
+set(KDEPIMLIBS_VERSION_PATCH 62)
 set(KDEPIMLIBS_VERSION \
${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH})  \
  
--- trunk/KDE/kdepimlibs/kpimtextedit/textedit.cpp #1180966:1180967
@@ -568,14 +568,19 @@
   return result;
 }
 
+void TextEdit::insertImage( const QImage &image, const QFileInfo&fileInfo )
+{
+  QString imageName = fileInfo.baseName().isEmpty() ? i18nc( "Start of the filename \
for an image", "image" ) : fileInfo.baseName(); +  d->addImageHelper( imageName, \
image ); +}
+
 void TextEdit::insertFromMimeData( const QMimeData *source )
 {
   // Add an image if that is on the clipboard
   if ( textMode() == KRichTextEdit::Rich && source->hasImage() && \
d->imageSupportEnabled ) {  QImage image = qvariant_cast<QImage>( source->imageData() \
);  QFileInfo fi( source->text() );
-    QString imageName = fi.baseName().isEmpty() ? i18nc( "Start of the filename for \
                an image", "image" ) : fi.baseName();
-    d->addImageHelper( imageName, image );
+    insertImage( image, fi );
     return;
   }
 
--- trunk/KDE/kdepimlibs/kpimtextedit/textedit.h #1180966:1180967
@@ -33,7 +33,7 @@
 #include <memory>
 
 class KUrl;
-
+class QFileInfo;
 namespace KPIMTextEdit {
 
 class TextEditPrivate;
@@ -263,8 +263,11 @@
      *  @since 4.6
      */
     bool isEnableImageActions() const;
+  /*
+   * @since 4.6
+   */
+  void insertImage( const QImage &image, const QFileInfo&info );
 
-
   protected:
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]