amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 19:35:38 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 54cc41b15e02fc61bfa80e7db07aeb97e541fdfc

Browse Source 
Monotone-Revision: 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-21T15:50:07
This commit is contained in:
Wolfgang Sourdeau
2012-03-21 15:50:07 +00:00
parent f4311032a0
commit 7a655ff8ce
7 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUserManager.m
+13 -2
View File
@@ -816,11 +816,12 @@
{
NSMutableDictionary *compactContacts, *returnContact;
NSDictionary *userEntry;
NSArray *newContacts;
NSArray *newContacts, *allEmails;
NSMutableArray *emails;
NSString *uid, *email, *info;
NSNumber *isGroup;
id <SOGoSource> source;
NSUInteger count, max;
compactContacts = [NSMutableDictionary dictionary];
while ((userEntry = [contacts nextObject]))
@@ -851,7 +852,17 @@
[returnContact setObject: emails forKey: @"emails"];
}
email = [userEntry objectForKey: @"mail"];
if (email && ![emails containsObject: email])
if ([email isKindOfClass: [NSArray class]])
{
allEmails = (NSArray *) email;
max = [allEmails count];
for (count = 0; count < max; count++)
{
email = [allEmails objectAtIndex: count];
[emails addObjectUniquely: email];
}
}
else if (email && ![emails containsObject: email])
[emails addObject: email];
email = [userEntry objectForKey: @"mozillasecondemail"];
if (email && ![emails containsObject: email])