LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: b32a3736b939af117ea6ccc7b8ce477cdc8c0b90

Browse source 
Monotone-Revision: bf4570489172c778883e36d3a499496d332f3813

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-15T19:57:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2008-10-15 19:57:17 +00:00
parent 2a28f07821
commit 76f4172408
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-10-15 Francis Lachapelle <flachapelle@inverse.ca>
* 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 <wsourdeau@inverse.ca> 2008-10-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailListView.m ([UIxMailListView * UI/MailerUI/UIxMailListView.m ([UIxMailListView

5
OGoContentStore/OCSContactFieldExtractor.m
View file

@ -61,8 +61,9 @@
if (value) if (value)
[fields setObject: value forKey: @"c_telephoneNumber"]; [fields setObject: value forKey: @"c_telephoneNumber"];
value = [vCard preferredEMail]; value = [vCard preferredEMail];
if (value) if (![value isNotNull])
[fields setObject: value forKey: @"c_mail"]; value = @"";
[fields setObject: value forKey: @"c_mail"];
values = [vCard org]; values = [vCard org];
max = [values count]; max = [values count];
if (max > 0) if (max > 0)

7
UI/Contacts/UIxContactEditor.m
View file

@ -289,8 +289,11 @@
potential = [[elements objectAtIndex: 0] value: 0]; potential = [[elements objectAtIndex: 0] value: 0];
if (!workMail) if (!workMail)
{ {
if (homeMail && homeMail == potential && max > 1) if (homeMail && homeMail == potential)
workMail = [[elements objectAtIndex: 1] value: 0]; {
if (max > 1)
workMail = [[elements objectAtIndex: 1] value: 0];
}
else else
workMail = potential; workMail = potential;
} }