From 49a74909d7a04cbe770b259a6f462d06c765343e Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Wed, 25 Apr 2012 21:35:29 +0000 Subject: [PATCH] * SoObjects/Mailer/SOGoDraftObject.m (-updateFromLDIFRecord:): carry the c_info attribute in vcards through the x-sogo-contactinfo attribute. This functionality was lost a while ago. We used to use the NOTE attribute for this. From now on, the sogo-connector.autoComplete.commentAttribute have to be set to 'unprocessed:x-sogo-contactinfo' instead of 'Notes'. Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c Monotone-Revision: 402b5b43e7c75b50806b41e7372eed0e61a4de9f Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-04-25T21:35:29 --- ChangeLog | 11 +++++++++++ SoObjects/Contacts/NGVCard+SOGo.m | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 481de2beb..b675ce8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-04-25 Jean Raby + + * SoObjects/Mailer/SOGoDraftObject.m + (-updateFromLDIFRecord:): carry the c_info attribute + in vcards through the x-sogo-contactinfo attribute. + This functionality was lost a while ago. + We used to use the NOTE attribute for this. From now on, + the sogo-connector.autoComplete.commentAttribute have to be set to + 'unprocessed:x-sogo-contactinfo' instead of 'Notes'. + + 2012-04-25 Wolfgang Sourdeau * SoObjects/Mailer/SOGoDraftObject.m diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m index b462ad147..0039b73c5 100644 --- a/SoObjects/Contacts/NGVCard+SOGo.m +++ b/SoObjects/Contacts/NGVCard+SOGo.m @@ -297,7 +297,11 @@ convention: else [self setBday: @""]; - [self setNote: [ldifRecord objectForKey: @"description"]]; + /* hack to carry SOGoLDAPContactInfo to vcards */ + [[self uniqueChildWithTag: @"x-sogo-contactinfo"] + setSingleValue: [ldifRecord objectForKey: @"c_info"] + forKey: @""]; + [self setCategories: [ldifRecord objectForKey: @"vcardcategories"]]; [self cleanupEmptyChildren];