merge of '583f127303a07196077a96b395056caf120f4117'

and 'e963d0d35abbc798444e616c5532ac4a7461c63a'

Monotone-Parent: 583f127303a07196077a96b395056caf120f4117
Monotone-Parent: e963d0d35abbc798444e616c5532ac4a7461c63a
Monotone-Revision: e01a6cf59f2ee75d0b39a067e4bb3dc8f01bc380

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-13T04:46:56
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,18 @@
+2010-01-12  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/SOGo/NSString+Utilities.m
+	We retain the autoreleased strings static variable
+	to avoir random issues with the -fromCSSIdentifier method
+
+	* Updated the Moz guide for the updateLink part of
+	the updates.php script.
+
+2010-01-11  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* UI/Contacts/UIxContactFolderActions.m (-importVcardData:):
+	We now support multiple vCards in the same file during
+	the import process
+
 2010-01-08  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.{h,m} - bindFields is now

SoObjects/SOGo/NSString+Utilities.m

@@ -317,6 +317,7 @@ static int cssEscapingCount;
 
   strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
                      @"_C_", @"_CO_", @"_SP_", nil];
+  [strings retain];
   cssEscapingStrings = [strings asPointersOfObjects];
 
   characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":",

UI/Contacts/UIxContactFolderActions.m

@@ -194,13 +194,27 @@
 
 - (int) importVcardData: (NSString *) vcardData
 {
-  NGVCard *card;
+  NSArray *allCards;
   int rc;
 
   rc = 0;
-  card = [NGVCard parseSingleFromSource: vcardData];
-  if ([self importVcard: card])
-    rc = 1;
+  allCards = [NGVCard parseFromSource: vcardData];
+
+  if (allCards && [allCards count])
+    {
+      int i;
+
+      for (i = 0; i < [allCards count]; i++)
+	{
+	  if (![self importVcard: [allCards objectAtIndex: i]])
+	    {
+	      rc = 0;
+	      break;
+	    }
+	  else
+	    rc++;
+	}
+    }
 
   return rc;
 }