From 4b38c7e48343d6ba1cd27133004e102a5b339eb4 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 2 Feb 2012 20:46:30 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: ab2ccda92b2df4cd7482934e46d69ed541d0ead8
Monotone-Revision: af376f6da2887cfa1d81ea2a63d137713304b757

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-02T20:46:30
---
 ChangeLog                           |  9 +++++++++
 UI/MailerUI/UIxMailAccountActions.m | 11 +++++++----
 UI/MailerUI/UIxMailMainFrame.m      |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c07563d61..05b50abf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-02  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailMainFrame.m (-composeAction): recipient
+	addresses are now passed as a JSON-formatted string.
+
+	* UI/MailerUI/UIxMailAccountActions.m (-composeAction): the
+	received "mailto" parameter is now a JSON-formatted string; we
+	parse it accordingly.
+
 2012-02-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 0a9327135..2f9911ee8 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/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"];
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 746196fe1..0d121651b 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/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"])