From e963d80625b88baccb798462ec6345575e41c33a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 23 Oct 2007 17:46:51 +0000 Subject: [PATCH] Monotone-Parent: 356263e44ccecc6b46fd886306e8b6e2273c29a6 Monotone-Revision: dfabbf3e9d4598beba86c88fa7cd60b04d540e54 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-10-23T17:46:51 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/Contacts/SOGoContactLDAPFolder.m | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748dfb9d8..e00779233 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-10-23 Wolfgang Sourdeau + * SoObjects/Contacts/SOGoContactLDAPFolder.m: if "displayName" is + empty, use "c_cn" instead. + * SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount -inboxFolderInContext:_ctx]) ([SOGoMailAccount -draftsFolderInContext:_ctx]) ([SOGoMailAccount -sentFolderInContext:_ctx]): no longer make use diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index 5f1ad9ecb..4a266c4b3 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -161,10 +161,11 @@ forKey: @"c_name"]; data = [oldRecord objectForKey: @"displayName"]; + if (!data) + data = [oldRecord objectForKey: @"c_cn"]; if (!data) data = @""; - [newRecord setObject: data - forKey: @"displayName"]; + [newRecord setObject: data forKey: @"displayName"]; data = [oldRecord objectForKey: @"mail"]; if (!data)