See ChangeLog.

Monotone-Parent: 42fa26da9b1def06a194726cab4199338a4bdf4c
Monotone-Revision: 88b07aa8edf775fa02705a9c03a0f8f14f905db3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-15T22:22:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-07-15 22:22:11 +00:00
parent 8aae19aeb8
commit 620872202d
14 changed files with 111 additions and 72 deletions
+7 -2
View File
@@ -193,6 +193,11 @@ BootstrapNSUserDefaults ()
return [[self dictionaryForKey: @"domains"] allKeys];
}
- (BOOL) addDomainToUID
{
return ([[self domainIds] count] > 0 && [self boolForKey: @"SOGoAddDomainToUID"]);
}
- (NSArray *) loginDomains
{
NSMutableArray *filteredLoginDomains;
@@ -237,11 +242,11 @@ BootstrapNSUserDefaults ()
[domains addObjectsFromArray: currentGroup];
}
// Remove lookup domain from list
// Remove lookup domain and invalid domains
groups = [domains objectEnumerator];
while ((currentDomain = [groups nextObject]))
{
if ([currentDomain isEqualToString: domain])
if ([currentDomain isEqualToString: domain] || ![definedDomains containsObject: currentDomain])
[domains removeObject: currentDomain];
}