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

List:       kde-commits
Subject:    branches/KDE/4.3/kdepim/korganizer (merge)
From:       Allen Winter <winter () kde ! org>
Date:       2009-08-20 12:39:57
Message-ID: 1250771997.874902.18049.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1013679 by winterz:

Backport r1007406 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1006371 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1006371 | winterz | 2009-08-03 18:17:49 +0200 (Mon, 03 Aug 2009) | 13 lines
  
  Merged revisions 1006369 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1006369 | winterz | 2009-08-03 12:09:55 -0400 (Mon, 03 Aug 2009) | 6 lines
    
    when DND email messages as attachments, try to use the mail subject as the
    attachment name.
    kolab/issue3772
    
    MERGE: e4,trunk
  ........
................



 M  +13 -1     koeditorattachments.cpp  


--- branches/KDE/4.3/kdepim/korganizer/koeditorattachments.cpp #1013678:1013679
@@ -741,8 +741,20 @@
                                          const QString &label )
 {
   AttachmentIconItem *item = new AttachmentIconItem( 0, mAttachments );
+
+  QString nlabel = label;
+  if ( mimeType == "message/rfc822" ) {
+    // mail message. try to set the label from the mail Subject:
+    QString line( data );
+    int index = line.indexOf( "Subject:" );
+    if ( index >= 0 ) {
+      nlabel = line.mid( index, 100 ).remove( "Subject:" ).
+               simplified().replace( ' ', '_' ).section( '_', 0, 3 );
+    }
+  }
+
   item->setData( data );
-  item->setLabel( label );
+  item->setLabel( nlabel );
   if ( mimeType.isEmpty() ) {
     item->setMimeType( KMimeType::findByContent( data )->name() );
   } else {
[prev in list] [next in list] [prev in thread] [next in thread]