LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: 4363c5abe7a96c858bbccbbad1061ca3229e0217

Browse source 
Monotone-Revision: e4dd1805b69eb0dd4c475583c505042783d21bc4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-06T14:27:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-08-06 14:27:06 +00:00
parent b880434179
commit 6a99f7e54f
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2010-08-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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.

12
UI/MailerUI/UIxMailEditor.m
View file

@ -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];
}
}