From 1355f8077de15bed044ff50fc52a681509b0e099 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 10 Jul 2009 12:47:54 +0000
Subject: [PATCH 1/2] Monotone-Parent: 3a355e79e6eee869bec77ad32e28a6640e81cd02
 Monotone-Revision: a3012f209b73b78a6c9e34d61aedf2907383b05b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-10T12:47:54
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                          | 5 +++++
 SoObjects/SOGo/SOGoContentObject.m | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a6879aaef..fdc71f777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoContentObject.m (-davResourceType): new
+	resource that returns an empty string for DAV compliance.
+
 2009-07-09  Cyril Robert <crobert@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m: Display .tiff as
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index d7da26f10..b884782ab 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -393,6 +393,11 @@
 		   [content lengthOfBytesUsingEncoding: NSUTF8StringEncoding]];
 }
 
+- (NSString *) davResourceType
+{
+  return @"";
+}
+
 - (NSException *) davMoveToTargetObject: (id) _target
 				newName: (NSString *) _name
 			      inContext: (id) _ctx

From a4efa19e98250acaa470a8201913377d508698f1 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 10 Jul 2009 13:22:21 +0000
Subject: [PATCH 2/2] Monotone-Parent: a3012f209b73b78a6c9e34d61aedf2907383b05b
 Monotone-Revision: 6bacc3304f196f108a7aa25e27eff1ab2474e5e0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-10T13:22:21
Monotone-Branch: ca.inverse.sogo
---
 SOPE/sope-patchset-r1660.diff | 66 +++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/SOPE/sope-patchset-r1660.diff b/SOPE/sope-patchset-r1660.diff
index 43c0b7424..6bef06d75 100644
--- a/SOPE/sope-patchset-r1660.diff
+++ b/SOPE/sope-patchset-r1660.diff
@@ -4066,6 +4066,72 @@ Index: sope-appserver/NGObjWeb/ChangeLog
  2009-06-10  Helge Hess  <helge.hess@opengroupware.org>
  
  	* DAVPropMap.plist: mapped {DAV:}current-user-principal (v4.9.37)
+Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+===================================================================
+--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m	(revision 1660)
++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m	(working copy)
+@@ -49,6 +49,8 @@
+ #define XMLNS_INTTASK \
+ @"{http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/}"
+ 
++static Class NSURLKlass = Nil;
++
+ @interface SoWebDAVRenderer(Privates)
+ - (BOOL)renderStatusResult:(id)_object withDefaultStatus:(int)_defStatus
+   inContext:(WOContext *)_ctx; 
+@@ -79,6 +81,8 @@
+   
+   if ((debugOn = [ud boolForKey:@"SoRendererDebugEnabled"]))
+     NSLog(@"enabled debugging in SoWebDAVRenderer (SoRendererDebugEnabled)");
++
++  NSURLKlass = [NSURL class];
+ }
+ 
+ + (id)sharedRenderer {
+@@ -616,16 +620,19 @@
+     [r appendContentString:s];
+   }
+   else {
++    s = [self stringForValue:value ofProperty:_key prefixes:nsToPrefix];
+     [r appendContentCharacter:'<'];
+     [r appendContentString:extName];
+-    [r appendContentCharacter:'>'];
+-          
+-    s = [self stringForValue:value ofProperty:_key prefixes:nsToPrefix];
+-    [r appendContentString:s];
+-          
+-    [r appendContentString:@"</"];
+-    [r appendContentString:extName];
+-    [r appendContentString:@">"];
++    if ([s length] > 0) {
++      [r appendContentCharacter:'>'];
++      [r appendContentString:s];
++      [r appendContentString:@"</"];
++      [r appendContentString:extName];
++      [r appendContentString:@">"];
++    }
++    else {
++      [r appendContentString:@"/>"];
++    }
+     if (formatOutput) [r appendContentCharacter:'\n'];
+   }
+ }
+@@ -694,8 +701,13 @@
+     }
+ 
+     /* tidy href */
+-    href = [self tidyHref:href baseURL:baseURL];
+-    
++    if (useRelativeURLs) {
++      if ([href isKindOfClass: NSURLKlass])
++        href = [href path];
++    }
++    else
++      href = [self tidyHref:href baseURL:baseURL];
++
+     /* tidy status */
+     stat = [self tidyStatus:stat];
+   }
 Index: sope-appserver/NGObjWeb/WODirectAction.m
 ===================================================================
 --- sope-appserver/NGObjWeb/WODirectAction.m	(revision 1660)