Monotone-Parent: b32a3736b939af117ea6ccc7b8ce477cdc8c0b90
Monotone-Revision: bf4570489172c778883e36d3a499496d332f3813 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-10-15T19:57:17 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
2a28f07821
commit
76f4172408
|
@ -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>
|
||||
|
||||
* UI/MailerUI/UIxMailListView.m ([UIxMailListView
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue