amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-11 16:28:51 +00:00
Code Issues Projects Releases Wiki Activity

merge of '2a87115bccec235f2a2e55f0bc7710d46e961afd'

Browse Source 
and '2fc38e65f96b51fa85b4171735f3413808da5422'

Monotone-Parent: 2a87115bccec235f2a2e55f0bc7710d46e961afd
Monotone-Parent: 2fc38e65f96b51fa85b4171735f3413808da5422
Monotone-Revision: 2828658dbefac205b7160b9ca55913b64dacacd6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-04-26 12:28:44 +00:00
parent 3b8fb5d0be 24e6f4ed7c
commit be5a16e3fb
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2012-04-25 Jean Raby <jraby@inverse.ca>
* 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 <wsourdeau@inverse.ca>
* UI/PreferencesUI/UIxPreferences.m (_extractMainIdentity:): save

6
SoObjects/Contacts/NGVCard+SOGo.m
View File

@@ -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];