merge of 'c3a6f31e848fe565a228ae5d9bf30dfdc905bea8'

and 'eda5c525a4bff80cf6f3bc99808aeca62b525c78'

Monotone-Parent: c3a6f31e848fe565a228ae5d9bf30dfdc905bea8
Monotone-Parent: eda5c525a4bff80cf6f3bc99808aeca62b525c78
Monotone-Revision: f770d812a46b526af6dd29630df45683a5bf503d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-18T19:00:29
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-10-18 19:00:29 +00:00
3 changed files with 11 additions and 10 deletions

View File

@@ -6,6 +6,11 @@
2011-10-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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

View File

@@ -24,6 +24,7 @@
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSFileHandle.h>
#import <Foundation/NSProcessInfo.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSThread.h>
#import <NGObjWeb/SoProductRegistry.h>
@@ -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. */

View File

@@ -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