From b4939043572ac699286647b4dad302b52a2eb1d6 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Oct 2009 20:25:36 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 46d81097556b9377a3e1d2a4ed9a7083a5de8a77 Monotone-Revision: 5cc529e77d87c48d01d645b60e6978e296c9f09a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-10-23T20:25:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 ++ UI/MailerUI/UIxMailMainFrame.m | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3c0ae8d13..01a314f7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ no FN attribute and no N attribute. (-composeAction): fixed the case when dealing with a contact with no email address. + (-composeAction): fixed the case when dealing with a contact from + an LDAP source. * UI/Scheduler/UIxComponentEditor.m (-calendarList): added proper verification of deletion rights on the current calendar and diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index b367f9a02..4f8064cb1 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -37,6 +37,7 @@ #import #import #import +#import #import #import @@ -230,7 +231,8 @@ [addresses addObject: formattedMail]; } } - else if ([contact isKindOfClass: [SOGoContactGCSEntry class]]) + else if ([contact isKindOfClass: [SOGoContactGCSEntry class]] + || [contact isKindOfClass: [SOGoContactLDIFEntry class]]) { // We fetch the preferred email address of the contact or // the first defined email address @@ -239,6 +241,7 @@ if (formattedMail) [addresses addObject: formattedMail]; } + uid = [uids nextObject]; }