diff --git a/ChangeLog b/ChangeLog index 724ccbd57..65ffdd9db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ 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..0d7ba1ade 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -24,6 +24,7 @@ #import #import +#import #import #import #import @@ -77,6 +78,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. */ 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