[patch] kmail-3.5.6-debian-18_optimize_splitAddressInternal.diff

kmail-3.5.6-debian-18_optimize_splitAddressInternal.diff (text/plain), 4.85 KB, created by Peter Alfredsen (RETIRED) on 2007-03-18 14:53:36 UTC

http://bugs.kde.org/137033 :
we have been shipping this patch in debian for a couple of months. We have gotten one report of some drawbacks with it, but I still consider them less important than a freezing kmail. 
 
 A user writes: 
 <quote> 
 Since version 4:3.5.5.dfsg.1-2  kmail stopped treating correctly my name in 
 the header. The last à in my last name is lost (strangely enough if I write 
 it not in the last position of my name in the profile it works without 
 problem). Prior to that version it worked without problem. I suspect the 
 culprit is 
  18_optimize_splitAddressInternal.diff 
 </quote> 
 
 Original report is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=405867 
 
 /Sune 


Index: libemailfunctions/email.cpp
===================================================================
--- libemailfunctions/email.cpp	(Revision 599840)
+++ libemailfunctions/email.cpp	(Arbeitskopie)
@@ -111,7 +111,14 @@
   displayName = "";
   addrSpec = "";
   comment = "";
-
+  
+  // these strings are later copied to displayName resp. addrSpec resp. comment
+  // we don't operate directly on those variables, since as ByteArray deriverates
+  // they have a miserable performance on operator+
+  QString dName;
+  QString aSpec;
+  QString cmmt;
+  
   if ( address.isEmpty() )
     return KPIM::AddressEmpty;
 
@@ -129,26 +136,26 @@
     case TopLevel : {
       switch ( *p ) {
       case '"' : inQuotedString = !inQuotedString;
-                 displayName += *p;
+                 dName += *p;
                  break;
       case '(' : if ( !inQuotedString ) {
                    context = InComment;
                    commentLevel = 1;
                  }
                  else
-                   displayName += *p;
+                   dName += *p;
                  break;
       case '<' : if ( !inQuotedString ) {
                    context = InAngleAddress;
                  }
                  else
-                   displayName += *p;
+                   dName += *p;
                  break;
       case '\\' : // quoted character
-                 displayName += *p;
+                 dName += *p;
                  ++p; // skip the '\'
                  if ( *p )
-                   displayName += *p;
+                   dName += *p;
                  else
                    return KPIM::UnexpectedEnd;
                  break;
@@ -159,57 +166,57 @@
                      return KPIM::UnexpectedComma;
                  }
                  else
-                   displayName += *p;
+                   dName += *p;
                  break;
-      default :  displayName += *p;
+      default :  dName += *p;
       }
       break;
     }
     case InComment : {
       switch ( *p ) {
       case '(' : ++commentLevel;
-                 comment += *p;
+                 cmmt += *p;
                  break;
       case ')' : --commentLevel;
                  if ( commentLevel == 0 ) {
                    context = TopLevel;
-                   comment += ' '; // separate the text of several comments
+                   cmmt += ' '; // separate the text of several comments
                  }
                  else
-                   comment += *p;
+                   cmmt += *p;
                  break;
       case '\\' : // quoted character
-                 comment += *p;
+                 cmmt += *p;
                  ++p; // skip the '\'
                  if ( *p )
-                   comment += *p;
+                   cmmt += *p;
                  else
                    return KPIM::UnexpectedEnd;
                  break;
-      default :  comment += *p;
+      default :  cmmt += *p;
       }
       break;
     }
     case InAngleAddress : {
       switch ( *p ) {
       case '"' : inQuotedString = !inQuotedString;
-                 addrSpec += *p;
+                 aSpec += *p;
                  break;
       case '>' : if ( !inQuotedString ) {
                    context = TopLevel;
                  }
                  else
-                   addrSpec += *p;
+                   aSpec += *p;
                  break;
       case '\\' : // quoted character
-                 addrSpec += *p;
+                 aSpec += *p;
                  ++p; // skip the '\'
                  if ( *p )
-                   addrSpec += *p;
+                   aSpec += *p;
                  else
                    return KPIM::UnexpectedEnd;
                  break;
-      default :  addrSpec += *p;
+      default :  aSpec += *p;
       }
       break;
     }
@@ -223,9 +230,10 @@
   if ( context == InAngleAddress )
     return KPIM::UnclosedAngleAddr;
 
-  displayName = displayName.stripWhiteSpace();
-  comment = comment.stripWhiteSpace();
-  addrSpec = addrSpec.stripWhiteSpace();
+	
+  displayName = dName.stripWhiteSpace().latin1();
+  comment = cmmt.stripWhiteSpace().latin1();
+  addrSpec = aSpec.stripWhiteSpace().latin1();
 
   if ( addrSpec.isEmpty() ) {
     if ( displayName.isEmpty() )