amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-19 07:04:53 +00:00
Code Issues Projects Releases Wiki Activity

merge of '402b5b43e7c75b50806b41e7372eed0e61a4de9f'

Browse Source 
and '4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea'

Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f
Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea
Monotone-Revision: 06f33f8f7c4581f3ec39d5cce6e3b77a99d436b0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:08
This commit is contained in:
Francis Lachapelle
2012-04-26 12:28:08 +00:00
parent 49a74909d7 5b59ebfe11
commit a8c28faeb7
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+11 -8
View File
@@ -577,7 +577,7 @@
- (void) _appendSystemMailAccount
{
NSString *fullName, *replyTo, *imapLogin, *imapServer, *signature,
*encryption, *scheme, *action, *query, *customValue;
*encryption, *scheme, *action, *query, *customEmail;
NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
NSNumber *port;
NSMutableArray *identities;
@@ -652,19 +652,22 @@
if ([[self domainDefaults] mailCustomFromEnabled])
{
[self userDefaults];
customValue = [_defaults mailCustomEmail];
if ([customValue length] > 0)
customEmail = [_defaults mailCustomEmail];
fullName = [_defaults mailCustomFullName];
if ([customEmail length] > 0 || [fullName length] > 0)
{
identity = [NSMutableDictionary new];
[identity setObject: customValue forKey: @"email"];
if ([customEmail length] == 0)
customEmail = [mails objectAtIndex: 0];
fullName = [_defaults mailCustomFullName];
if (![fullName length])
if ([fullName length] == 0)
{
fullName = [self cn];
if (![fullName length])
if ([fullName length] == 0)
fullName = login;
}
identity = [NSMutableDictionary new];
[identity setObject: customEmail forKey: @"email"];
[identity setObject: fullName forKey: @"fullName"];
if ([replyTo length] > 0)