Monotone-Parent: 3773ee4ff0af58d57aae68dc6e314c7d9fd6e0d5

Monotone-Revision: 464f9995a141aebf7f9676a03dc864b160e34646

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-30T14:30:53

ChangeLog

@@ -1,5 +1,8 @@
 2011-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m (-davPrincipalURL): moved from
+	SOGoUserFolder.
+
 	* SoObjects/SOGo/WORequest+SOGo.m (-isICal, -isICal4): updated for
 	iCal 5.
 

SoObjects/SOGo/SOGoFolder.m

@@ -562,4 +562,22 @@
   return nil;
 }
 
+- (NSArray *) davPrincipalURL
+{
+  NSArray *principalURL;
+  NSString *classes;
+
+  if ([[context request] isICal4])
+    {
+      classes = [[self davComplianceClassesInContext: context]
+                  componentsJoinedByString: @", "];
+      [[context response] setHeader: classes forKey: @"DAV"];
+    }
+
+  principalURL = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+                          [self davURLAsString], nil];
+
+  return [NSArray arrayWithObject: principalURL];
+}
+
 @end

SoObjects/SOGo/SOGoUserFolder.m

@@ -635,16 +635,6 @@
 	   getCNForUID: nameInContainer];
 }
 
-- (NSArray *) davPrincipalURL
-{
-  NSArray *principalURL;
-
-  principalURL = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-                          [self davURLAsString], nil];
-
-  return [NSArray arrayWithObject: principalURL];
-}
-
 - (NSException *) setDavSignature: (NSString *) newSignature
 {
   SOGoUserDefaults *ud;