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

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