LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
maint-2.0.2
Ludovic Marcotte 2011-02-17 20:06:12 +00:00
parent 9113ad10c5
commit ca78ff546c
4 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,4 +1,9 @@
<<<<<<< variant A
2011-02-17 Ludovic Marcotte <lmarcotte@inverse.ca>
* Modifed all tools to NOT check for SOGoUserSources
as it'll break if we are in multi-domain with no
master sources defined.
2011-02-15 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
@ -7,15 +12,12 @@
SOGoEnableEMailAlarms was set to YES prior doing this.
This fixes bug #1079.
>>>>>>> variant B
2011-02-16 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
fixed a bug with IE8 that would not set the "checked" attribute
properly on a checkbox.
####### Ancestor
======= end
2011-02-14 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxDatePicker.m

22
Tools/sogo-ealarms-notify.m
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];

21
Tools/sogo-slapd-sockd.m
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;

21
Tools/sogo-tool.m
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;