merge of 'd4476114c133c77a0b6b0b596165243704a68fb6'

and 'e3a0cebd32124aa09d35255a3e302efd4805257e'

Monotone-Parent: d4476114c133c77a0b6b0b596165243704a68fb6
Monotone-Parent: e3a0cebd32124aa09d35255a3e302efd4805257e
Monotone-Revision: 5e1c3fa09515ef226b59db74a98b650a9a33af6a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-13T18:56:12
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -14,6 +14,9 @@
 
 2011-07-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* Tools/sogo-tool.m (main): instantiate SOGoSystemDefaults in
+	order to properly inject the entries from SOGoDefaults.plist.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_op_get_fid_by_name): removed
 	obsolete method.
 

Tools/sogo-tool.m

@@ -30,6 +30,8 @@
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
+#import <SOGo/SOGoSystemDefaults.h>
+
 #import "SOGoTool.h"
 
 /* TODO:
@@ -242,6 +244,8 @@ main (int argc, char **argv, char **env)
 
   pool = [NSAutoreleasePool new];
 
+  [SOGoSystemDefaults sharedSystemDefaults];
+
   ud = [NSUserDefaults standardUserDefaults];
   setupUserDefaults (ud);