Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c

Monotone-Revision: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T21:32:18
This commit is contained in:
Wolfgang Sourdeau
2012-04-25 21:32:18 +00:00
parent f7e9f2fc7d
commit 5b59ebfe11
3 changed files with 27 additions and 19 deletions
+9 -11
View File
@@ -1297,17 +1297,15 @@
returned by the user directory service. */
if ([value length] == 0
|| [[user allEmails] containsObject: value])
{
[userDefaults setMailCustomEmail: nil];
[userDefaults setMailCustomFullName: nil];
}
else
{
[userDefaults setMailCustomEmail: value];
value = [[identity objectForKey: @"fullName"]
stringByTrimmingSpaces];
[userDefaults setMailCustomFullName: value];
}
value = nil;
[userDefaults setMailCustomEmail: value];
value = [[identity objectForKey: @"fullName"]
stringByTrimmingSpaces];
if ([value length] == 0
|| [[user cn] isEqualToString: value])
value = nil;
[userDefaults setMailCustomFullName: value];
}
value = [[identity objectForKey: @"replyTo"]