From bbe1bae54d30fe4c424b2c0b8cfb58436ab4ada7 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 8 Jun 2010 13:35:25 +0000
Subject: [PATCH] Monotone-Parent: 8f68fd83a48c51821eb064aa4f6738398e02e41d
 Monotone-Revision: 47f011047becbfa93b21ffe7ca90810b1d9af684

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-08T13:35:25
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                            |  4 ++++
 SoObjects/Appointments/SOGoAppointmentFolderObject.h |  2 ++
 SoObjects/Appointments/SOGoAppointmentFolderObject.m | 10 ++++++++++
 3 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a6e4c4621..e2810bb0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolderObject.m
+	(-displayName, -davDisplayName): new accessors that are forwarded
+	to the real folder object.
+
 	* UI/WebServerResources/UIxAclEditor.js: (onAclLoadHandler) we
 	bind the "unload" event rather than "beforeunload", which does not
 	seem to work on IE.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolderObject.h b/SoObjects/Appointments/SOGoAppointmentFolderObject.h
index c69d6a444..c8c1e9175 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolderObject.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolderObject.h
@@ -34,6 +34,8 @@
 
 - (iCalCalendar *) contentCalendar;
 
+- (NSString *) displayName;
+
 @end
 
 #endif /* SOGOAPPOINTMENTFOLDEROBJECT_H */
diff --git a/SoObjects/Appointments/SOGoAppointmentFolderObject.m b/SoObjects/Appointments/SOGoAppointmentFolderObject.m
index 223115ccf..95077945f 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolderObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolderObject.m
@@ -182,4 +182,14 @@
   return nil;
 }
 
+- (NSString *) displayName
+{
+  return [[self _folder] displayName];
+}
+
+- (NSString *) davDisplayName
+{
+  return [self displayName];
+}
+
 @end