From 6a99f7e54fe1a22b48d843d28b062de6e4482167 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 6 Aug 2010 14:27:06 +0000 Subject: [PATCH] Monotone-Parent: 4363c5abe7a96c858bbccbbad1061ca3229e0217 Monotone-Revision: e4dd1805b69eb0dd4c475583c505042783d21bc4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-06T14:27:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/MailerUI/UIxMailEditor.m | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a651500de..0e2cb181e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-08-06 Wolfgang Sourdeau + * UI/MailerUI/UIxMailEditor.m (-fromEmails): the list of + identities is now taken from the corresponding mail account dict. + * SoObjects/Mailer/SOGoMailForward.m (-signature): same as below. * UI/MailerUI/UIxMailAccountActions.m (-composeAction): same as below. diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index 87420f393..04c4e7446 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -347,19 +347,21 @@ static NSArray *infoKeys = nil; - (NSArray *) fromEMails { - NSArray *allIdentities; + NSArray *identities; int count, max; NSString *email; + SOGoMailAccount *account; if (!fromEMails) { - allIdentities = [[context activeUser] allIdentities]; - fromEMails = [NSMutableArray new]; - max = [allIdentities count]; + account = [[self clientObject] mailAccountFolder]; + identities = [account identities]; + max = [identities count]; + fromEMails = [[NSMutableArray alloc] initWithCapacity: max]; for (count = 0; count < max; count++) { email - = [self _emailFromIdentity: [allIdentities objectAtIndex: count]]; + = [self _emailFromIdentity: [identities objectAtIndex: count]]; [fromEMails addObjectUniquely: email]; } }