Monotone-Parent: b3104cb2f524576b6a02514df135076db60274ea

Monotone-Revision: 1471bacc37d4bfc7718c85c0760024d89c4440ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:23:45
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactEditor.m

@@ -19,14 +19,18 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSString.h>
+
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoObject.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSNull+misc.h>
+
 #import <NGCards/NGVCard.h>
 #import <NGCards/NSArray+NGCards.h>
 
-#import <NGObjWeb/SoObject.h>
-
 #import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactFolder.h>
-#import "common.h"
 
 #import "UIxContactEditor.h"
 
@@ -536,7 +540,8 @@
 
 - (id) writeAction
 {
-  NSString *email, *url;
+  NSString *email, *cn, *url;
+  NSMutableString *address;
 
   card = [[self clientObject] vCard];
   [self initSnapshot];
@@ -546,7 +551,16 @@
     email = [snapshot objectForKey: @"workMail"];
 
   if (email)
-    url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", email];
+    {
+      address = [NSMutableString string];
+      cn = [card fn];
+      if ([cn length] > 0)
+	[address appendFormat: @"%@ <%@>", cn, email];
+      else
+	[address appendString: email];
+	
+      url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", address];
+    }
   else
     url = @"Mail/compose";