From 4aef7d24cb02e7783367f7530c783a626ea8e043 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 30 Nov 2011 14:21:00 +0000
Subject: [PATCH] Monotone-Parent: 4ef540dc6e51d77f7bceceddf7ba16238cd49b1a
 Monotone-Revision: 2327e7e903cd36a63f8ce3ec294e55d00a7f6fd3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-30T14:21:00
---
 ChangeLog                                         |  7 ++++++-
 .../Appointments/SOGoAppointmentInboxFolder.m     | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bbbaf7d5..52b26e912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2011-11-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+2011-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentInboxFolder.m
+	(-davScheduleDefaultCalendarURL): fixed method to return a
+	properly formatted XML chunk.
+	(-displayName): returns nameInContainer.
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(-davCalendarTimeZone): fixed by embedding the VTIMEZONE element
diff --git a/SoObjects/Appointments/SOGoAppointmentInboxFolder.m b/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
index 33a9cde73..a30242fcf 100644
--- a/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
@@ -76,17 +76,17 @@
   return nil;
 }
 
-- (NSArray *) davScheduleDefaultCalendarURL
+- (SOGoWebDAVValue *) davScheduleDefaultCalendarURL
 {
-  NSArray *response;
   NSString *personalURL;
+  NSDictionary *href;
 
   personalURL = [NSString stringWithFormat: @"%@personal/",
                           [container davURLAsString]];
-  response = [NSArray arrayWithObjects: @"href", XMLNS_WEBDAV, @"D",
-                      personalURL, nil];
+  href = davElementWithContent (@"href", XMLNS_WEBDAV, personalURL);
 
-  return response;
+  return [davElementWithContent (@"schedule-default-calendar-URL", XMLNS_CALDAV, href)
+                                asWebDAVValue];
 }
 
 - (NSArray *) aclsForUser: (NSString *) userID
@@ -109,4 +109,9 @@
   return acls;
 }
 
+- (NSString *) displayName
+{
+  return nameInContainer;
+}
+
 @end