From 884498f49fb94920f55ccc84458cd3f67a4226fc Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 6 Dec 2007 22:48:41 +0000
Subject: [PATCH] Monotone-Parent: e08089f9a1045c8de9972e8a201de91f52fd18c7
 Monotone-Revision: cef936e3d6818f80d736b01c2f30e5de56e00b93

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-06T22:48:41
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  |  7 +++++++
 SoObjects/Contacts/SOGoContactGCSFolder.m  | 15 +++++++++++++++
 SoObjects/Contacts/SOGoContactLDAPFolder.m | 15 +++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4ac97057f..31bb08301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-12-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder -davResourceType]): declared as a carddav
+	addressbook collection.
+
+	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder
+	-davResourceType]):  declared as a carddav addressbook collection.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -davLastModified]):
 	override SoObject's implementation. Otherwise a localized date is returned.
 
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 074048b8a..dfc77caef 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -267,6 +267,21 @@
   return @"vcard-collection";
 }
 
+- (NSArray *) davResourceType
+{
+  NSMutableArray *resourceType;
+  NSArray *cardDavCollection;
+
+  cardDavCollection
+    = [NSArray arrayWithObjects: @"addressbook",
+	       @"urn:ietf:params:xml:ns:carddav", nil];
+
+  resourceType = [NSMutableArray arrayWithArray: [super davResourceType]];
+  [resourceType addObject: cardDavCollection];
+
+  return resourceType;
+}
+
 /* sorting */
 - (NSComparisonResult) compare: (id) otherFolder
 {
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index a23f09a53..f3d173283 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -140,6 +140,21 @@
   return @"vcard-collection";
 }
 
+- (NSArray *) davResourceType
+{
+  NSMutableArray *resourceType;
+  NSArray *cardDavCollection;
+
+  cardDavCollection
+    = [NSArray arrayWithObjects: @"addressbook",
+	       @"urn:ietf:params:xml:ns:carddav", nil];
+
+  resourceType = [NSMutableArray arrayWithArray: [super davResourceType]];
+  [resourceType addObject: cardDavCollection];
+
+  return resourceType;
+}
+
 - (id) lookupName: (NSString *) objectName
         inContext: (WOContext *) lookupContext
           acquire: (BOOL) acquire