Monotone-Parent: 5fa8ca8896455803ea0da4db7e5c1e18e8328871

Monotone-Revision: a6e08bd7d394d186c6f5606933ed09de2031e7bb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-07T16:53:19
Monotone-Branch: ca.inverse.sogo

UI/PreferencesUI/UIxPreferences.m

@@ -486,33 +486,16 @@ static BOOL shouldDisplayPasswordChange = NO;
   return [(NSDictionary *) item keysWithFormat: @"%{fullName} <%{email}>"];
 }
 
-- (NSMutableDictionary *) defaultIdentity
-{
-  NSMutableDictionary *currentIdentity, *defaultIdentity;
-  NSEnumerator *identities;
-
-  defaultIdentity = nil;
-
-  identities = [[user allIdentities] objectEnumerator];
-  while (!defaultIdentity
-	 && (currentIdentity = [identities nextObject]))
-    if ([[currentIdentity objectForKey: @"isDefault"] boolValue])
-      defaultIdentity = currentIdentity;
-
-  return defaultIdentity;
-}
-
 - (NSString *) signature
 {
-  return [[self defaultIdentity] objectForKey: @"signature"];
+  return [[user defaultIdentity] objectForKey: @"signature"];
 }
 
 - (void) setSignature: (NSString *) newSignature
 {
-  [[self defaultIdentity] setObject: newSignature
+  [[user defaultIdentity] setObject: newSignature
 			  forKey: @"signature"];
-  [userDefaults setObject: [user mailAccounts]
-		forKey: @"MailAccounts"];
+  [user saveMailAccounts];
 }
 
 - (id <WOActionResults>) defaultAction