mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-20 19:05:25 +00:00
propagate from branch 'ca.inverse.sogo.1_3_12' (head c5233a2a4e6a6abdb50191daf1eb589c9ff5cf80)
to branch 'ca.inverse.sogo' (head 212622191a26c7b5f257c536a45dfea03f404bc1) Monotone-Parent: 212622191a26c7b5f257c536a45dfea03f404bc1 Monotone-Parent: c5233a2a4e6a6abdb50191daf1eb589c9ff5cf80 Monotone-Revision: e18b5ae2235fde5d7f7f569ead8452a2217d9b5c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-14T21:24:10 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -819,6 +819,7 @@
|
||||
NSMutableArray *emails;
|
||||
NSString *uid, *email, *info;
|
||||
NSNumber *isGroup;
|
||||
id <SOGoSource> source;
|
||||
|
||||
compactContacts = [NSMutableDictionary dictionary];
|
||||
while ((userEntry = [contacts nextObject]))
|
||||
@@ -831,7 +832,9 @@
|
||||
{
|
||||
returnContact = [NSMutableDictionary dictionary];
|
||||
[returnContact setObject: uid forKey: @"c_uid"];
|
||||
[returnContact setObject: [userEntry objectForKey: @"source"] forKey: @"source"];
|
||||
source = [userEntry objectForKey: @"source"];
|
||||
if (source)
|
||||
[returnContact setObject: source forKey: @"source"];
|
||||
[compactContacts setObject: returnContact forKey: uid];
|
||||
}
|
||||
if (![[returnContact objectForKey: @"c_name"] length])
|
||||
|
||||
Reference in New Issue
Block a user