Monotone-Parent: 66fe156475b1f789bc5d20c857350ca9afea9556

Monotone-Revision: a164259525f718f804b625a9f09b4c3b3c9e83f8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-09T20:12:07
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoFolder.h

@@ -46,4 +46,10 @@
 
 @end
 
+@interface SOGoFolder (GroupDAVExtensions)
+
+- (NSString *) groupDavResourceType;
+
+@end
+
 #endif /* SOGOFOLDER_H */

SoObjects/SOGo/SOGoFolder.m

@@ -26,6 +26,8 @@
 
 #import <NGObjWeb/SoSelectorInvocation.h>
 
+#import <SaxObjC/XMLNamespaces.h>
+
 #import "NSString+Utilities.h"
 
 #import "SOGoFolder.h"
@@ -202,6 +204,24 @@
   return @"httpd/unix-directory";
 }
 
+- (NSArray *) davResourceType
+{
+  NSArray *rType, *groupDavCollection;
+
+  if ([self respondsToSelector: @selector (groupDavResourceType)])
+    {
+      groupDavCollection
+	= [NSArray arrayWithObjects: [self groupDavResourceType],
+		   XMLNS_GROUPDAV, nil];
+      rType = [NSArray arrayWithObjects: @"collection", groupDavCollection,
+		       nil];
+    }
+  else
+    rType = [NSArray arrayWithObject: @"collection"];
+
+  return rType;
+}
+
 /* folder type */
 
 - (NSString *) outlookFolderClass

SoObjects/SOGo/SOGoGCSFolder.h

@@ -87,10 +87,4 @@
 
 @end
 
-@interface SOGoGCSFolder (GroupDAVExtensions)
-
-- (NSString *) groupDavResourceType;
-
-@end
-
 #endif /* __SOGo_SOGoGCSFolder_H__ */

SoObjects/SOGo/SOGoGCSFolder.m

@@ -381,24 +381,6 @@ static NSString *defaultUserID = @"<default>";
   return nil;
 }
 
-- (NSArray *) davResourceType
-{
-  NSArray *rType, *groupDavCollection;
-
-  if ([self respondsToSelector: @selector (groupDavResourceType)])
-    {
-      groupDavCollection
-	= [NSArray arrayWithObjects: [self groupDavResourceType],
-		   XMLNS_GROUPDAV, nil];
-      rType = [NSArray arrayWithObjects: @"collection", groupDavCollection,
-		       nil];
-    }
-  else
-    rType = [NSArray arrayWithObject: @"collection"];
-
-  return rType;
-}
-
 - (NSArray *) toOneRelationshipKeys
 {
   /* toOneRelationshipKeys are the 'files' contained in a folder */