amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-20 22:23:19 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 0269f0e288002384896f59f89f8205c3327b32fb
Monotone-Revision: 46d81097556b9377a3e1d2a4ed9a7083a5de8a77

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-23T20:11:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-23 20:11:56 +00:00
parent fa43f053f7
commit 602d6748e8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -3,6 +3,8 @@
* UI/MailerUI/UIxMailMainFrame.m (-formattedMailtoString:): fixed
the case when dealing with a NGVCardReference (from a list) with
no FN attribute and no N attribute.
(-composeAction): fixed the case when dealing with a contact with
no email address.
* UI/Scheduler/UIxComponentEditor.m (-calendarList): added proper
verification of deletion rights on the current calendar and
UI/MailerUI/UIxMailMainFrame.m
+9 -4
View File
@@ -175,7 +175,7 @@
{
id contact;
NSArray *accounts, *contactsId, *cards;
NSString *firstAccount, *firstEscapedAccount, *newLocation, *parameters, *folderId, *uid;
NSString *firstAccount, *firstEscapedAccount, *newLocation, *parameters, *folderId, *uid, *formattedMail;
NSEnumerator *uids;
NSMutableArray *addresses;
NGVCard *card;
@@ -224,15 +224,20 @@
cards = [list cardReferences];
count = [cards count];
for (i = 0; i < count; i++)
[addresses addObject:
[self formattedMailtoString: [cards objectAtIndex: i]]];
{
formattedMail = [self formattedMailtoString: [cards objectAtIndex: i]];
if (formattedMail)
[addresses addObject: formattedMail];
}
}
else if ([contact isKindOfClass: [SOGoContactGCSEntry class]])
{
// We fetch the preferred email address of the contact or
// the first defined email address
card = [contact vCard];
[addresses addObject: [self formattedMailtoString: card]];
formattedMail = [self formattedMailtoString: card];
if (formattedMail)
[addresses addObject: formattedMail];
}
uid = [uids nextObject];
}