Monotone-Parent: 7545ebe978dbef5b48ca8ca88c024f6eaf3169a4

Monotone-Revision: 578cb5190f19cdf4730fac81fc0bbf070252b2b4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-03T16:34:47
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-07-03 16:34:47 +00:00
parent fe7e46b3f2
commit 124a263f93
2 changed files with 11 additions and 1 deletions
+6
View File
@@ -1,3 +1,9 @@
2009-07-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/LDAPUserManager.m (_fillContactMailRecords:): if
the user uid contains a "@", we set it directly as system email
rather than suffixing it with the default mail domain.
2009-07-02 Francis Lachapelle <flachapelle@inverse.ca>
* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+5 -1
View File
@@ -330,7 +330,11 @@ static NSLock *lock = nil;
emails = [contact objectForKey: @"emails"];
uid = [contact objectForKey: @"c_uid"];
systemEmail = [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
if ([uid rangeOfString: @"@"].location == NSNotFound)
systemEmail
= [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
else
systemEmail = uid;
[emails addObjectUniquely: systemEmail];
[contact setObject: [emails objectAtIndex: 0] forKey: @"c_email"];
}