From e43ac3de7860afd0d4461845c75c69bdc2ae1813 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 2 Feb 2007 20:47:21 +0000 Subject: [PATCH] Monotone-Parent: ac622b559d25436734cff876b9bf87744694f3da Monotone-Revision: 6ff7f1f265054d35bee90648f1c1b1ae73749a9e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-02-02T20:47:21 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ SoObjects/Contacts/SOGoContactLDAPEntry.m | 5 +++++ SoObjects/Contacts/SOGoContactLDAPFolder.m | 1 + 3 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4c84b8a94..6bf488158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-02-02 Wolfgang Sourdeau + + * SoObjects/Contacts/SOGoContactLDAPFolder.m + ([SOGoContactLDAPFolder -_searchAttributes]): retrieve "calFBURL" + from the server. + + * SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry + -vCard]): put the LDAP "calFBURL" field in the vCard's "FBURL" + entry. + 2007-01-31 Wolfgang Sourdeau * SoObjects/Appointments/SOGoCalendarComponent.m diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m index 92f38c436..7e047e4c5 100644 --- a/SoObjects/Contacts/SOGoContactLDAPEntry.m +++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m @@ -182,6 +182,11 @@ [element setValue: 3 to: location]; if (streetAddress || location) [vcard addChild: element]; + info = [ldapEntry singleAttributeWithName: @"calFBURL"]; + if (info) + [vcard addChildWithTag: @"FBURL" + types: nil + singleValue: info]; } return vcard; diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index bc4ae3a07..073055678 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -233,6 +233,7 @@ @"locality", @"birthyear", @"serialNumber", + @"calFBURL", nil]; }