From b4167565511e1602b34bd544c6379a5c6edf5706 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 22 Feb 2008 21:20:53 +0000
Subject: [PATCH] Monotone-Parent: 3f296062919cfbbae0e24137aa3637f886a274b3
 Monotone-Revision: 8f8ecd8d738bfaf099722644bfbdaee74d8b589d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-22T21:20:53
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                      | 7 +++++++
 SoObjects/Appointments/SOGoAppointmentFolder.m | 7 ++++++-
 SoObjects/Contacts/SOGoContactGCSFolder.m      | 7 ++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f6ad60c2..6b28ab8fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-02-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder
+	-davNamespaces]): same as below.
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -davNamespaces]): take the parents
+	namespaces into account.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -addUserInAcls:uid]):
 	new method.
 	([SOGoObject -removeUserFromAcls:uid]): new methods (see below).
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index aec706eef..745e312c4 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -287,7 +287,12 @@ static NSNumber   *sharedYes = nil;
 
 - (NSArray *) davNamespaces
 {
-  return [NSArray arrayWithObject: @"urn:ietf:params:xml:ns:caldav"];
+  NSMutableArray *ns;
+
+  ns = [NSMutableArray arrayWithArray: [super davNamespaces]];
+  [ns addObjectUniquely: @"urn:ietf:params:xml:ns:caldav"];
+
+  return ns;
 }
 
 - (id) davCalendarQuery: (id) queryContext
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index dfc77caef..eff8313e9 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -259,7 +259,12 @@
 
 - (NSArray *) davNamespaces
 {
-  return [NSArray arrayWithObject: @"urn:ietf:params:xml:ns:carddav"];
+  NSMutableArray *ns;
+
+  ns = [NSMutableArray arrayWithArray: [super davNamespaces]];
+  [ns addObjectUniquely: @"urn:ietf:params:xml:ns:carddav"];
+
+  return ns;
 }
 
 - (NSString *) groupDavResourceType