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

ChangeLog

@@ -11,6 +11,10 @@
 	CalendarDefaultFilter user default. Mantis 112
 	* UI/Scheduler/UIxCalListingActions.m (checkFilterValue): Added to support
 	CalendarDefaultFilter user default. Mantis 112
+	* SoObjects/SOGo/SOGoUser.m: Changed "signature" setting's place: MailSignature
+	Mantis 113.
+	* UI/PreferencesUI/UIxPreferences.m: Support for MailSignature setting.
+	Mantis 113.
 
 2009-08-19  Cyril Robert <crobert@inverse.ca>
 

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

UI/PreferencesUI/UIxPreferences.m

@@ -569,14 +569,19 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
 
 - (NSString *) signature
 {
-  return [[user defaultIdentity] objectForKey: @"signature"];
+  NSString *signature;
+
+  signature = [userDefaults stringForKey: @"MailSignature"];
+  // Old style
+  if (![signature length])
+    signature = [[user defaultIdentity] objectForKey: @"signature"];
+
+  return signature;
 }
 
 - (void) setSignature: (NSString *) newSignature
 {
-  [[user defaultIdentity] setObject: newSignature
-			  forKey: @"signature"];
-  [user saveMailAccounts];
+  [userDefaults setObject: newSignature forKey: @"MailSignature"];
 }
 
 - (NSArray *) replyPlacementList

UI/WebServerResources/UIxMailEditor.js

@@ -632,7 +632,7 @@ function lineBreakCount(str){
 
 function hasSignature() {
     try {
-        return(UserDefaults.MailAccounts[0].identities[0].signature.length > 0);
+        return(UserDefaults["MailSignature"].length > 0);
     } catch(e) {
         return false;
     }