From ba711bcad442d24af307bd0839d79a46ceedd5b5 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 18 Oct 2011 12:25:53 +0000 Subject: [PATCH 1/3] Fix for bug #1096 Monotone-Parent: 0b64839fea2e383dcc57f754615f294e164d5826 Monotone-Revision: 7006e81f038867b26d3ed4119e35ad3a2763d2d4 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-10-18T12:25:53 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoContentObject.m | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m index 6090fdde7..7e8c88fa3 100644 --- a/SoObjects/SOGo/SOGoContentObject.m +++ b/SoObjects/SOGo/SOGoContentObject.m @@ -411,11 +411,6 @@ return [NSString stringWithFormat: @"%u", length]; } -// - (NSString *) davResourceType -// { -// return @""; -// } - - (NSException *) davMoveToTargetObject: (id) _target newName: (NSString *) _name inContext: (id) _ctx @@ -424,11 +419,7 @@ Note: even for new objects we won't get a new name but a preinstantiated object representing the new one. */ - [self logWithFormat: - @"TODO: move not implemented:\n target: %@\n new name: %@", - _target, _name]; - return [NSException exceptionWithHTTPStatus:405 /* not allowed */ - reason:@"this object cannot be copied via WebDAV"]; + return [self moveToFolder: _target]; } - (NSException *) davCopyToTargetObject: (id)_target From 389d62a1cac66d301ee01050e0521d2d00b69b7f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 17 Oct 2011 23:28:40 +0000 Subject: [PATCH 2/3] Monotone-Parent: 7006e81f038867b26d3ed4119e35ad3a2763d2d4 Monotone-Revision: 4de190eb54e811b0e429f7196209e16bcb702c5e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-10-17T23:28:40 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ OpenChange/MAPIStoreSOGo.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5bb5c2931..b4994af30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-10-17 Wolfgang Sourdeau + * OpenChange/MAPIStoreSOGo.m (sogo_backend_init): invoke + -[NSProcessInfo initializeWithArguments:count:environment:] in + order to avoid an infinite loop with GNUstep occurring under + strange circumstances. + * OpenChange/MAPIStoreMapping.m (-initForUsername:withIndexing:): attach the struct tdb_wrap *indexing to a new memCtx ivar, in order to make sure its value is retained until the release of the diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index edd758aad..6027e12a5 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -77,6 +77,10 @@ sogo_backend_init (void) the encoding specified in the file. */ putenv ("GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding"); + [NSProcessInfo initializeWithArguments: NULL + count: 0 + environment: environ]; + [SOGoSystemDefaults sharedSystemDefaults]; // /* We force the plugin to base its configuration on the SOGo tree. */ From b68e3b5455f03d010ad90d8ec6e7ef4c36f1461b Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 17 Oct 2011 23:29:13 +0000 Subject: [PATCH 3/3] Monotone-Parent: 4de190eb54e811b0e429f7196209e16bcb702c5e Monotone-Revision: eda5c525a4bff80cf6f3bc99808aeca62b525c78 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-10-17T23:29:13 Monotone-Branch: ca.inverse.sogo --- OpenChange/MAPIStoreSOGo.m | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 6027e12a5..0d7ba1ade 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -24,6 +24,7 @@ #import #import +#import #import #import #import