Mantis 113: MailFieldNames are ignored when composing email with saved preferences

Monotone-Parent: fd4f04fce6a66b3dc14b58f9b67f93c6af6d450a
Monotone-Revision: dc00d231986ac84ebf39553ae085b3efe0f8fae1

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-08-20T20:33:57
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUser.m

@@ -413,6 +413,7 @@ _timeValue (NSString *key)
       [self logWithFormat: @"'SOGoDefaultMailDomain' is not set"];
       doSave = NO;
     }
+  doSave = NO;
   if (doSave)
     [[self userDefaults] setObject: [self mailAccounts]
 			 forKey: @"MailAccounts"];
@@ -870,7 +871,14 @@ _timeValue (NSString *key)
 
 - (NSString *) signature
 {
-  return [[self primaryIdentity] objectForKey: @"signature"];
+  NSString *signature;
+
+  signature = [[self userDefaults] stringForKey: @"MailSignature"];
+  // Old style
+  if (![signature length])
+    signature = [[self primaryIdentity] objectForKey: @"signature"];
+
+  return signature;
 }
 
 - (NSString *) replyPlacement