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

List:       kmail-devel
Subject:    PATCH: fix #14101
From:       Daniel Naber <daniel.naber () t-online ! de>
Date:       2001-03-31 16:03:14
[Download RAW message or body]

Hi,

a simple patch (already commited), but please review anyway.

Regards
 Daniel

--=20
Daniel Naber, Paul-Gerhardt-Str. 2, 33332 Guetersloh, Germany
Tel. 05241-59371, Mobil 0170-4819674

["fix14101.diff" (text/plain)]

Index: kmaddrbook.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmaddrbook.cpp,v
retrieving revision 1.31
diff -u -r1.31 kmaddrbook.cpp
--- kmaddrbook.cpp	2001/02/18 21:02:51	1.31
+++ kmaddrbook.cpp	2001/03/31 16:01:46
@@ -205,22 +205,25 @@
     if (AddressBook::NoError !=
 	kernel->KABaddrBook()->addressbook()->getEntry( key, entry ))
       continue;
-    if ((entry.emails.count() > 0) && !entry.emails[0].isEmpty()) {
-      if (entry.fn.isEmpty() || (entry.emails[0].find( "<" ) != -1))
-	addr = "";
-      else
-	addr = "\"" + entry.fn + "\" ";
-      email = entry.emails[0];
-      if (!addr.isEmpty() && (email.find( "<" ) == -1)
-	  && (email.find( ">" ) == -1)
-	  && (email.find( "," ) == -1))
-	  addr += "<" + email + ">";
-      else
-	  addr += email;
-      addr.stripWhiteSpace();
-      result->append( addr );
-      if (keys)
-	keys->append( key );
+    int emails_count;
+    for( emails_count = 0; emails_count < entry.emails.count(); emails_count++ ) {
+      if (!entry.emails[emails_count].isEmpty()) {
+	if (entry.fn.isEmpty() || (entry.emails[0].find( "<" ) != -1))
+	  addr = "";
+	else
+	  addr = "\"" + entry.fn + "\" ";
+	email = entry.emails[emails_count];
+	if (!addr.isEmpty() && (email.find( "<" ) == -1)
+	    && (email.find( ">" ) == -1)
+	    && (email.find( "," ) == -1))
+	    addr += "<" + email + ">";
+	else
+	    addr += email;
+	addr.stripWhiteSpace();
+	result->append( addr );
+	if (keys)
+	  keys->append( key );
+      }
     }
   }
 }

_______________________________________________
Kmail Developers mailing list
Kmail@master.kde.org
http://master.kde.org/mailman/listinfo/kmail


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