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

merge of '6a57f3626fde7fbfcae50a7c894c35736ad794c8'

Browse Source 
and 'be5e3b15cde44245718151c5191d6eb1a73b061b'

Monotone-Parent: 6a57f3626fde7fbfcae50a7c894c35736ad794c8
Monotone-Parent: be5e3b15cde44245718151c5191d6eb1a73b061b
Monotone-Revision: ac9fdaf585c4ef94cbc22bcacdf8a0bef4ccd28a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-07T16:16:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-12-07 16:16:33 +00:00
parent 0b1dab8023 3af65adf0a
commit 36fdb452e1
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2009-12-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/PreferencesUI/UIxPreferences.m (-defaultAction):
setVacationOptions: and setForwardOptions: are now set from here.
* SoObjects/SOGo/SOGoDomainDefaults.m (-forwardEnabled)
(-vacationEnabled): we must query "SOGoForwardEnabled" and
"SOGoVacationEnabled", respectively.
2009-12-03 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/iCalEntityObject+Utilities.m (-findParticipant:):

4
SoObjects/SOGo/SOGoDomainDefaults.m
View File

@@ -152,12 +152,12 @@
- (BOOL) forwardEnabled
{
return [self boolForKey: @"SOGoForceIMAPLoginWithEmail"];
return [self boolForKey: @"SOGoForwardEnabled"];
}
- (BOOL) vacationEnabled
{
return [self boolForKey: @"SOGoForceIMAPLoginWithEmail"];
return [self boolForKey: @"SOGoVacationEnabled"];
}
- (NSString *) mailingMechanism

19
UI/PreferencesUI/UIxPreferences.m
View File

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