From e7e31ef543bf0a694f0393ddc1c53aefd5da2c5b Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 23 Oct 2009 21:06:05 +0000 Subject: [PATCH] Monotone-Parent: b2a6613b1d3ed16ddb16ffa95f6c3e5eddd14422 Monotone-Revision: 3f0a698566b940e183824009e4aae638d5263054 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-10-23T21:06:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Contacts/SOGoContactSourceFolder.m | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index c26c05cdc..b2ba962a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-10-23 Wolfgang Sourdeau + * SoObjects/Contacts/SOGoContactSourceFolder.m + (-initWithName:andDisplayName:inContainer:): use the source name + when the displayname is nil. + * SoObjects/SOGo/SOGoUserManager.m (_registerSource:): added sanity checks and warnings to the user. diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m index 472ffa03d..83fa114e2 100644 --- a/SoObjects/Contacts/SOGoContactSourceFolder.m +++ b/SoObjects/Contacts/SOGoContactSourceFolder.m @@ -124,6 +124,8 @@ if ((self = [self initWithName: newName inContainer: newContainer])) { + if (![newDisplayName length]) + newDisplayName = newName; ASSIGN (displayName, newDisplayName); }