mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-21 11:25:24 +00:00
Monotone-Parent: 730c8a73525c070f1f66243a9c692f2ee0adbcd0
Monotone-Revision: be5e3b15cde44245718151c5191d6eb1a73b061b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-12-07T16:16:01 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -87,20 +87,14 @@
|
||||
{
|
||||
vacationOptions = [[userDefaults vacationOptions] mutableCopy];
|
||||
if (!vacationOptions)
|
||||
{
|
||||
vacationOptions = [NSMutableDictionary new];
|
||||
[userDefaults setVacationOptions: vacationOptions];
|
||||
}
|
||||
vacationOptions = [NSMutableDictionary new];
|
||||
}
|
||||
|
||||
if ([dd forwardEnabled])
|
||||
{
|
||||
forwardOptions = [[userDefaults forwardOptions] mutableCopy];
|
||||
if (!forwardOptions)
|
||||
{
|
||||
forwardOptions = [NSMutableDictionary new];
|
||||
[userDefaults setForwardOptions: forwardOptions];
|
||||
}
|
||||
forwardOptions = [NSMutableDictionary new];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -875,6 +869,7 @@
|
||||
id <WOActionResults> results;
|
||||
WORequest *request;
|
||||
NSString *method;
|
||||
SOGoDomainDefaults *dd;
|
||||
|
||||
request = [context request];
|
||||
if ([[request method] isEqualToString: @"POST"])
|
||||
@@ -882,7 +877,13 @@
|
||||
SOGoMailAccount *account;
|
||||
id mailAccounts;
|
||||
id folder;
|
||||
|
||||
|
||||
dd = [[context activeUser] domainDefaults];
|
||||
if ([dd vacationEnabled])
|
||||
[userDefaults setVacationOptions: vacationOptions];
|
||||
if ([dd forwardEnabled])
|
||||
[userDefaults setForwardOptions: forwardOptions];
|
||||
|
||||
[userDefaults synchronize];
|
||||
|
||||
mailAccounts = [[[context activeUser] mailAccounts] objectAtIndex: 0];
|
||||
|
||||
Reference in New Issue
Block a user