See ChangeLog

Monotone-Parent: 5b2bc8f17ae0dbc785abcc143ebf3cd49d100698
Monotone-Revision: b0f0e0a5f736b92a629c7c421d50a5ae9f3f8c6e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-02-17T20:06:12
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2011-02-17 20:06:12 +00:00
parent 9113ad10c5
commit ca78ff546c
4 changed files with 22 additions and 52 deletions
+6 -16
View File
@@ -40,25 +40,15 @@ main (int argc, char **argv, char **env)
ud = [NSUserDefaults standardUserDefaults];
[ud addSuiteNamed: @"sogod"];
if ([ud objectForKey: @"SOGoUserSources"])
if ([ud objectForKey: @"SOGoEnableEMailAlarms"])
{
if ([ud objectForKey: @"SOGoEnableEMailAlarms"])
{
notifier = [SOGoEAlarmsNotifier new];
if (![notifier run])
rc = -1;
[notifier release];
}
else
NSLog (@"EMail alarms are disabled in the SOGo configuration.");
notifier = [SOGoEAlarmsNotifier new];
if (![notifier run])
rc = -1;
[notifier release];
}
else
{
NSLog (@"No LDAP source is configured in the SOGo configuration of this"
@" account. Please make sure to use this tool under the same"
@" username as SOGo.");
rc = -1;
}
NSLog (@"EMail alarms are disabled in the SOGo configuration.");
[pool release];
+5 -16
View File
@@ -40,23 +40,12 @@ main (int argc, char **argv, char **env)
ud = [NSUserDefaults standardUserDefaults];
[ud addSuiteNamed: @"sogod"];
if ([ud objectForKey: @"SOGoUserSources"])
{
sockd = [SOGoSockD new];
if ([sockd run])
rc = 0;
else
rc = -1;
[sockd release];
}
sockd = [SOGoSockD new];
if ([sockd run])
rc = 0;
else
{
NSLog (@"No LDAP source is configured in the SOGo configuration of this"
@" account. Please make sure to use this tool under the same"
@" username as SOGo.");
rc = -1;
}
rc = -1;
[sockd release];
[pool release];
return rc;
+5 -16
View File
@@ -245,23 +245,12 @@ main (int argc, char **argv, char **env)
ud = [NSUserDefaults standardUserDefaults];
setupUserDefaults (ud);
if ([ud objectForKey: @"SOGoUserSources"])
{
dispatcher = [SOGoToolDispatcher new];
if ([dispatcher run])
rc = 0;
else
rc = -1;
[dispatcher release];
}
dispatcher = [SOGoToolDispatcher new];
if ([dispatcher run])
rc = 0;
else
{
NSLog (@"No LDAP source is configured in the SOGo configuration of this"
@" account. Please make sure to use this tool under the same"
@" username as SOGo.");
rc = -1;
}
rc = -1;
[dispatcher release];
[pool release];
return rc;