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

Monotone-Parent: d730814de50b7c4fd0fa165b4b6e02e968ff60ef

Browse Source 
Monotone-Revision: 148caf2ae66d2024b6008a2633e9145890921239

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-09-01T20:27:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-09-01 20:27:45 +00:00
parent 5ae619bea4
commit 4d5c0ff6f4
28 changed files with 770 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+28 -5
View File
@@ -502,13 +502,16 @@
- (void) _appendSystemMailAccount
{
NSString *fullName, *imapLogin, *imapServer, *signature, *encryption, *port, *scheme;
NSMutableDictionary *mailAccount, *identity, *mailboxes;
NSString *fullName, *imapLogin, *imapServer, *signature, *encryption, *port,
*scheme, *action;
NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
NSMutableArray *identities;
NSArray *mails;
NSURL *url;
unsigned int count, max;
[self userDefaults];
mailAccount = [NSMutableDictionary new];
imapLogin = [[SOGoUserManager sharedUserManager]
@@ -557,7 +560,7 @@
[mailAccount setObject: port forKey: @"port"];
[mailAccount setObject: encryption forKey: @"encryption"];
/* identities */
identities = [NSMutableArray new];
mails = [self allEmails];
[mailAccount setObject: [mails objectAtIndex: 0] forKey: @"name"];
@@ -573,7 +576,7 @@
fullName = login;
[identity setObject: fullName forKey: @"fullName"];
[identity setObject: [mails objectAtIndex: count] forKey: @"email"];
signature = [[self userDefaults] mailSignature];
signature = [_defaults mailSignature];
if (signature)
[identity setObject: signature forKey: @"signature"];
[identities addObject: identity];
@@ -585,9 +588,29 @@
[mailAccount setObject: identities forKey: @"identities"];
[identities release];
/* receipts */
if ([_defaults allowUserReceipt])
{
receipts = [NSMutableDictionary new];
[receipts setObject: @"allow" forKey: @"receiptAction"];
action = [_defaults userReceiptNonRecipientAction];
if (action)
[receipts setObject: action forKey: @"receiptNonRecipientAction"];
action = [_defaults userReceiptOutsideDomainAction];
if (action)
[receipts setObject: action forKey: @"receiptOutsideDomainAction"];
action = [_defaults userReceiptAnyAction];
if (action)
[receipts setObject: action forKey: @"receiptAnyAction"];
[mailAccount setObject: receipts forKey: @"receipts"];
[receipts release];
}
/* mailboxes */
mailboxes = [NSMutableDictionary new];
[self userDefaults];
[self _migrateFolderSettings];
[mailboxes setObject: [_defaults draftsFolderName]
forKey: @"Drafts"];