propagate from branch 'ca.inverse.sogo.1_3_12' (head 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00)

to branch 'ca.inverse.sogo' (head 15b9d9900d3605d1920661f52678d25d93c587ef)

Monotone-Parent: 15b9d9900d3605d1920661f52678d25d93c587ef
Monotone-Parent: 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00
Monotone-Revision: ac81d77fda86dad3ce300e48e20f65bd639b24cb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-03T16:59:00
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailAccountActions.m

@@ -212,7 +212,7 @@
   SOGoDraftsFolder *drafts;
   SOGoDraftObject *newDraftMessage;
   NSString *urlBase, *url, *value, *signature;
-  NSArray *mailTo;
+  id mailTo;
   NSMutableDictionary *headers;
   BOOL save;
 
@@ -225,9 +225,12 @@
   value = [[self request] formValueForKey: @"mailto"];
   if ([value length] > 0)
     {
-      mailTo = [[value stringByUnescapingURL] componentsSeparatedByString: @","];
-      [headers setObject: mailTo forKey: @"to"];
-      save = YES;
+      mailTo = [[value stringByUnescapingURL] objectFromJSONString];
+      if (mailTo && [mailTo isKindOfClass: [NSArray class]])
+        {
+          [headers setObject: (NSArray *) mailTo forKey: @"to"];
+          save = YES;
+        }
     }
 
   value = [[self request] formValueForKey: @"subject"];

UI/MailerUI/UIxMailMainFrame.m

@@ -251,7 +251,7 @@
 
           if ([addresses count] > 0)
 	    parameters = [NSString stringWithFormat: @"?mailto=%@", 
-				   [addresses componentsJoinedByString: @","]];
+                                   [addresses jsonRepresentation]];
         }
     }
   else if ([[request formValues] objectForKey: @"mailto"])