amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-18 19:48:53 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 8714a90171f0256424d65122b72c98a61ef5f55a

Browse Source 
Monotone-Revision: 72e1b73ecd70270e80d3a060fabe219cfcdd21cd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-19T16:51:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-19 16:51:02 +00:00
parent 702af74324
commit 972aa027d9
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2009-11-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tools/sogo-tool.m (main): we now check that the SOGo
configuration is valid and consequently that the tool runs under
the same account as SOGo.
* UI/Scheduler/UIxComponentEditor.m (-_handleAttendeeData): make
direct use of the JSON constructor of NSDictionary rather than
instantiating an NSScanner. This simplifies the code.

20
Tools/sogo-tool.m
View File

@@ -229,12 +229,22 @@ main (int argc, char **argv, char **env)
ud = [NSUserDefaults standardUserDefaults];
[ud addSuiteNamed: @"sogod"];
dispatcher = [SOGoToolDispatcher new];
if ([dispatcher run])
rc = 0;
if ([ud objectForKey: @"SOGoLDAPSources"])
{
dispatcher = [SOGoToolDispatcher new];
if ([dispatcher run])
rc = 0;
else
rc = -1;
[dispatcher release];
}
else
rc = -1;
[dispatcher release];
{
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;
}
[pool release];