From 81e9c338a07af1dfba89239f2f6cc137be5a123c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 29 Aug 2008 17:33:19 +0000 Subject: [PATCH] Monotone-Parent: 24c2f8206b434e2894e6aa447358893a06cc7dc7 Monotone-Revision: 17fbb038ecae79b08f511eacf0417a89716461bc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-29T17:33:19 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 +++++++++ SoObjects/Mailer/SOGoDraftObject.m | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 693050cdc..1de228d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-29 Ludovic Marcotte + + * SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject + -addRecipients:recipientstoArray:array]): same as below. + + * SoObjects/Mailer/SOGoDraftObject.m: + ([SOGoDraftObject -addEMailsOfAddresses:_addrstoArray:_ma]): test + if the returned email is nil before adding it to the array. + 2008-08-28 Wolfgang Sourdeau * UI/MailerUI/UIxMailActions.m ([UIxMailActions diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index cad8df860..d526f8922 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -391,7 +391,9 @@ static BOOL showTextAttachmentsInline = NO; addresses = [_addrs objectEnumerator]; while ((currentAddress = [addresses nextObject])) - [_ma addObject: [currentAddress email]]; + if ([currentAddress email]) + [_ma addObject: [currentAddress email]]; + } - (void) _addRecipients: (NSArray *) recipients @@ -402,7 +404,8 @@ static BOOL showTextAttachmentsInline = NO; addresses = [recipients objectEnumerator]; while ((currentAddress = [addresses nextObject])) - [array addObject: [currentAddress baseEMail]]; + if ([currentAddress baseEMail]) + [array addObject: [currentAddress baseEMail]]; } - (void) _purgeRecipients: (NSArray *) recipients