amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-03 12:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 7cc283107984b0e4e73a623772894e8cc7db2e29

Browse Source 
Monotone-Revision: e4ae22f3a47d42e15309decfe8624c2f7914869b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-03T14:22:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-08-03 14:22:46 +00:00
parent 78ac3c734d
commit 2b9fd23e4c
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2006-08-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/AgenorUserManager.m ([AgenorUserManager
+initialize]): init defaultMailDomain with the user default
"SOGoDefaultMailDomain".
2006-08-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactEditorBase.m ([UIxContactEditorBase

21
SoObjects/SOGo/AgenorUserManager.m
View File

@@ -57,7 +57,7 @@ static NSString *ldapHost = nil;
static NSString *ldapBaseDN = nil;
static NSNull *sharedNull = nil;
static NSString *fallbackIMAP4Server = nil;
static NSString *defaultMailDomain = @"equipement.gouv.fr";
static NSString *defaultMailDomain = nil;
static NSString *shareLDAPClass = @"mineqMelBoite";
static NSString *shareLoginSeparator = @".-.";
static NSString *mailEmissionAttrName = @"mineqMelmailEmission";
@@ -69,7 +69,8 @@ static NSArray *fromEMailAttrs = nil;
static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
+ (void)initialize {
+ (void) initialize
{
static BOOL didInit = NO;
NSUserDefaults *ud;
NSString *tmp;
@@ -93,7 +94,21 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
if ([fallbackIMAP4Server length] > 0)
NSLog(@"Note: using fallback IMAP4 server: '%@'", fallbackIMAP4Server);
else
fallbackIMAP4Server = nil;
{
if (fallbackIMAP4Server)
[fallbackIMAP4Server release];
fallbackIMAP4Server = nil;
}
defaultMailDomain = [[ud stringForKey:@"SOGoDefaultMailDomain"] copy];
if ([defaultMailDomain length] == 0)
{
if (defaultMailDomain)
[defaultMailDomain release];
defaultMailDomain = nil;
NSLog(@"WARNING: no default mail domain (please specify"
" 'SOGoDefaultMailDomain' in the user default db)");
}
fromEMailAttrs =
[[NSArray alloc] initWithObjects:mailEmissionAttrName, nil];