amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-01 01:39:30 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 6920d8cb7745acb5c4574fa10c4101bc1a87cca7
Monotone-Revision: 05db10b383b8539c538b66c73af8db19b07dc441

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-07-16T14:11:14
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-07-16 14:11:14 +00:00
parent 9fb92479d6
commit 9c9ae46e8c
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2010-07-16 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Contacts/UIxContactView.m
In secondaryEmail, we make sure that we loop
in all available email address and we pick the
first one that doesn't match the primaryEmail
2010-07-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentObject.m

26
UI/Contacts/UIxContactView.m
View File

@@ -139,15 +139,29 @@
// We might not have a preferred item but rather something like this:
// EMAIL;TYPE=work:dd@ee.com
// EMAIL;TYPE=home:ff@gg.com
// In this case, we always return the last entry.
//
// or:
//
// EMAIL;TYPE=INTERNET:a@a.com
// EMAIL;TYPE=INTERNET,HOME:b@b.com
//
// In this case, we always return the entry NOT matching the primaryEmail
if ([emails count] > 0)
{
email = [[emails objectAtIndex: [emails count]-1] value: 0];
int i;
if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email];
for (i = 0; i < [emails count]; i++)
{
email = [[emails objectAtIndex: i] value: 0];
if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
{
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, [[card fn] stringByReplacingString: @"\"" withString: @""], email, email];
break;
}
}
}
return [self _cardStringWithLabel: @"Additional Email:"