merge of '5115a135492e7714cb2a621cfb35a30ce246f20d'

and 'e61122c5a0ba3f7e5dfada968f88f155fc08bb40'

Monotone-Parent: 5115a135492e7714cb2a621cfb35a30ce246f20d
Monotone-Parent: e61122c5a0ba3f7e5dfada968f88f155fc08bb40
Monotone-Revision: a9323afc29bd494143d2c78639e7a02f3d3804cb

Monotone-Author: ludovic@Sophos.ca
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-21T22:01:23
Monotone-Date: 2008-08-22T14:42:00
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2008-08-21 22:01:23 +00:00
2 changed files with 12 additions and 4 deletions
+8
View File
@@ -1,3 +1,11 @@
2008-08-21 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/LDAPUserManager.m
Renamed the SOGOLDAPUserManagerCleanupInterval defaults to
SOGoLDAPUserManagerCleanupInterval.
We correctly add our timer to the runloop and fixed
a typo in the selector name.
2008-08-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/NSString+Utilities.m ([NSString
+4 -4
View File
@@ -1,6 +1,6 @@
/* LDAPUserManager.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse groupe conseil
* Copyright (C) 2007-2008 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@@ -130,11 +130,11 @@ static BOOL forceImapLoginWithEmail = NO;
sourcesMetadata = nil;
users = [NSMutableDictionary new];
cleanupInterval
= [ud integerForKey: @"SOGOLDAPUserManagerCleanupInterval"];
= [ud integerForKey: @"SOGoLDAPUserManagerCleanupInterval"];
if (cleanupInterval)
cleanupTimer = [NSTimer timerWithTimeInterval: cleanupInterval
cleanupTimer = [NSTimer scheduledTimerWithTimeInterval: cleanupInterval
target: self
selector: @selector (cleanupUsers)
selector: @selector(cleanupSources)
userInfo: nil
repeats: YES];
[self _prepareLDAPSourcesWithDefaults: ud];