From 76f4172408b4e205610b79b3bef0992645b4f73a Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 15 Oct 2008 19:57:17 +0000 Subject: [PATCH] Monotone-Parent: b32a3736b939af117ea6ccc7b8ce477cdc8c0b90 Monotone-Revision: bf4570489172c778883e36d3a499496d332f3813 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-10-15T19:57:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 +++++++++ OGoContentStore/OCSContactFieldExtractor.m | 5 +++-- UI/Contacts/UIxContactEditor.m | 7 +++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf28e2471..842bf3cec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-15 Francis Lachapelle + + * UI/Contacts/UIxContactEditor.m ([_setupEmailFields]): avoid + setting the work mail if only the home mail is defined. + + * OGoContentStore/OCSContactFieldExtractor.m ([NSMutableDictionary + extractQuickFieldsFromVCard:vCard]): set email address to an empty + string if not defined. + 2008-10-15 Wolfgang Sourdeau * UI/MailerUI/UIxMailListView.m ([UIxMailListView diff --git a/OGoContentStore/OCSContactFieldExtractor.m b/OGoContentStore/OCSContactFieldExtractor.m index 24fb4246c..fa20b9807 100644 --- a/OGoContentStore/OCSContactFieldExtractor.m +++ b/OGoContentStore/OCSContactFieldExtractor.m @@ -61,8 +61,9 @@ if (value) [fields setObject: value forKey: @"c_telephoneNumber"]; value = [vCard preferredEMail]; - if (value) - [fields setObject: value forKey: @"c_mail"]; + if (![value isNotNull]) + value = @""; + [fields setObject: value forKey: @"c_mail"]; values = [vCard org]; max = [values count]; if (max > 0) diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index 2d8e19c6d..e7a56e1a6 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -289,8 +289,11 @@ potential = [[elements objectAtIndex: 0] value: 0]; if (!workMail) { - if (homeMail && homeMail == potential && max > 1) - workMail = [[elements objectAtIndex: 1] value: 0]; + if (homeMail && homeMail == potential) + { + if (max > 1) + workMail = [[elements objectAtIndex: 1] value: 0]; + } else workMail = potential; }