Monotone-Parent: e1dfc6f99fa7ee268a57e41fbd7edf9f87b4801a

Monotone-Revision: 79461b8ac05970c57a512022f8200f6a8524119e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-04-25T15:15:28
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2008-04-25 15:15:28 +00:00
parent 899c7b3135
commit e4e5aabd6f

View file

@ -333,8 +333,7 @@ static BOOL defaultMailDomainIsConfigured = NO;
forKey: @"MailAccess"];
ldapSources = [sources objectEnumerator];
currentSource = [ldapSources nextObject];
while (currentSource)
while ((currentSource = [ldapSources nextObject]))
{
userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid];
if (userEntry)
@ -355,7 +354,6 @@ static BOOL defaultMailDomainIsConfigured = NO;
[currentUser setObject: [NSNumber numberWithBool: NO]
forKey: @"MailAccess"];
}
currentSource = [ldapSources nextObject];
}
if (!cn)
@ -505,13 +503,9 @@ static BOOL defaultMailDomainIsConfigured = NO;
contacts = [NSMutableArray array];
ldapSources = [sources objectEnumerator];
currentSource = [ldapSources nextObject];
while (currentSource)
{
[contacts addObjectsFromArray:
[currentSource fetchContactsMatching: filter]];
currentSource = [ldapSources nextObject];
}
while ((currentSource = [ldapSources nextObject]))
[contacts addObjectsFromArray:
[currentSource fetchContactsMatching: filter]];
return [self _compactAndCompleteContacts: [contacts objectEnumerator]];
}