merge of 'c98e3872a8bdd768ed6e254e52f9956140773146'

and 'f547e80f0b37a2309a16da53656017a4ee10f80b'

Monotone-Parent: c98e3872a8bdd768ed6e254e52f9956140773146
Monotone-Parent: f547e80f0b37a2309a16da53656017a4ee10f80b
Monotone-Revision: 6d01c80e5eec109ea98411f9b345712653571eee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-18T19:24:46
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -12,7 +12,7 @@
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_init): invoke
 	-[NSProcessInfo initializeWithArguments:count:environment:] in
 	order to avoid an infinite loop with GNUstep occurring under
-	strange circumstances.
+	strange circumstances. Make use of "samba" as process name.
 
 	* OpenChange/MAPIStoreMapping.m (-initForUsername:withIndexing:):
 	attach the struct tdb_wrap *indexing to a new memCtx ivar, in

OpenChange/MAPIStoreSOGo.m

@@ -70,6 +70,7 @@ sogo_backend_init (void)
   Class MAPIApplicationK;
   NSUserDefaults *ud;
   SoProductRegistry *registry;
+  char *argv0 = "openchange";
 
   pool = [NSAutoreleasePool new];
 
@@ -78,8 +79,8 @@ sogo_backend_init (void)
      the encoding specified in the file. */
   putenv ("GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding");
 
-  [NSProcessInfo initializeWithArguments: NULL
-                                   count: 0
+  [NSProcessInfo initializeWithArguments: &argv0
+                                   count: 1
                              environment: environ];
 
   [SOGoSystemDefaults sharedSystemDefaults];