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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/libkdepim
From:       Allen Winter <winter () kde ! org>
Date:       2010-06-08 20:38:15
Message-ID: 20100608203815.CB5E8AC8CE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1136056 by winterz:

when dropping plain old text of emails, decode the whole thing
so we don't lose out on the displayName, comments, etc.
kolab/issue341l

MERGE: trunk


 M  +3 -14     addresseelineedit.cpp  


--- branches/kdepim/enterprise/kdepim/libkdepim/addresseelineedit.cpp #1136055:1136056
@@ -389,26 +389,15 @@
       }
     } else {
       // Let's see if this drop contains a comma separated list of emails
-      QStringList addrs = splitEmailAddrList( QString::fromUtf8( e->encodedData( "text/plain" ) ) );
+      QString dropData = QString::fromUtf8( e->encodedData( "text/plain" ) );
+      QStringList addrs = splitEmailAddrList( dropData );
       if ( addrs.count() > 0 ) {
-        QStringList::ConstIterator it;
-        QStringList emails;
-        for ( it = addrs.begin(); it != addrs.end(); ++it ) {
-          QString name, mail;
-          if ( getNameAndMail( (*it), name, mail ) ) {
-            emails.append( mail );
-          } else {
-            continue;
-          }
-        }
-        if ( emails.count() > 0 ) {
-          setText( emails.join( "," ) );
+        setText( normalizeAddressesAndDecodeIDNs( dropData ) );
           setEdited( true );
           return;
         }
       }
     }
-  }
 
   if ( m_useCompletion )
     m_smartPaste = true;
[prev in list] [next in list] [prev in thread] [next in thread]