Monotone-Parent: c30e47021628e9ce8728125370b09e1e258c1d79

Monotone-Revision: 4ada043f711dccb4b52526f8e7a63883fef5b173

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-20T21:38:15
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-09-20 21:38:15 +00:00
parent f64662c3e1
commit 6a602e49e2
2 changed files with 15 additions and 2 deletions

View File

@@ -1,5 +1,8 @@
2006-09-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
-vCard]): handle the "streetAddress" and "l" fields.
* UI/Templates/MailerUI/UIxMailEditor.wox: arranged the message
header fields by converting the tables to DIVs and SPANs.

View File

@@ -133,8 +133,8 @@
- (NGVCard *) vCard
{
NSString *info;
NSString *surname;
NSString *info, *surname, *streetAddress, *location;
CardElement *element;
if (!vcard)
{
@@ -169,6 +169,16 @@
[vcard addEmail: info
types: [NSArray arrayWithObjects: @"internet", @"pref", nil]];
[self _setPhonesOfVCard: vcard];
streetAddress = [ldapEntry singleAttributeWithName: @"streetAddress"];
location = [ldapEntry singleAttributeWithName: @"l"];
element = [CardElement elementWithTag: @"adr"
attributes: nil values: nil];
if (streetAddress)
[element setValue: 2 to: streetAddress];
if (location)
[element setValue: 3 to: location];
if (streetAddress || location)
[vcard addChild: element];
}
return vcard;