From da7d543cd5f70a9411d33ef92c8efb230e456644 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 1 Oct 2010 20:39:51 +0000
Subject: [PATCH] Monotone-Parent: 65260d073cfc05c6f9d0fe8d6611e5f69cf8f2ac
 Monotone-Revision: 3fc270699f526815c0a80c91edc34d0022547efb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-01T20:39:51
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                   | 4 ++++
 SoObjects/SOGo/SOGoObject.h | 1 +
 SoObjects/SOGo/SOGoObject.m | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 31930682a..3213fbd71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m (-displayName): new accessor.
+
 2010-09-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/UIxContactsUserFolders.js:
diff --git a/SoObjects/SOGo/SOGoObject.h b/SoObjects/SOGo/SOGoObject.h
index 5afa123a2..3502fc806 100644
--- a/SoObjects/SOGo/SOGoObject.h
+++ b/SoObjects/SOGo/SOGoObject.h
@@ -85,6 +85,7 @@
 /* accessors */
 
 - (NSString *) nameInContainer;
+- (NSString *) displayName;
 - (id) container;
 
 - (NSURL *) davURL;
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index a0e52c75b..0b3493afc 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -204,6 +204,11 @@
   return nameInContainer;
 }
 
+- (NSString *) displayName
+{
+  return [self nameInContainer];
+}
+
 - (id) container
 {
   return container;
@@ -350,7 +355,7 @@
 
 - (NSString *) davDisplayName
 {
-  return [self nameInContainer];
+  return [self displayName];
 }
 
 /* DAV ACL properties */