merge of '6a57f3626fde7fbfcae50a7c894c35736ad794c8'

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
3 changed files with 21 additions and 11 deletions
+2 -2
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