Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168

Monotone-Revision: 7786f49f6724383b92e91ba7998b99cfb52ceec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:27:21
This commit is contained in:
Wolfgang Sourdeau
2012-04-20 13:27:21 +00:00
parent 9ea333e6b6
commit fa4d2d3141
12 changed files with 135 additions and 65 deletions
+8 -2
View File
@@ -576,8 +576,8 @@
- (void) _appendSystemMailAccount
{
NSString *fullName, *imapLogin, *imapServer, *signature, *encryption,
*scheme, *action, *query;
NSString *fullName, *replyTo, *imapLogin, *imapServer, *signature,
*encryption, *scheme, *action, *query;
NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
NSNumber *port;
NSMutableArray *identities;
@@ -642,6 +642,8 @@
mails = [self allEmails];
[mailAccount setObject: [mails objectAtIndex: 0] forKey: @"name"];
replyTo = [_defaults mailReplyTo];
max = [mails count];
if (max > 1)
max--;
@@ -653,6 +655,10 @@
fullName = login;
[identity setObject: fullName forKey: @"fullName"];
[identity setObject: [mails objectAtIndex: count] forKey: @"email"];
if ([replyTo length] > 0)
[identity setObject: replyTo forKey: @"replyTo"];
signature = [_defaults mailSignature];
if (signature)
[identity setObject: signature forKey: @"signature"];