(fix) don't offer forward/vacation options in filters if not enabled

This commit is contained in:
Ludovic Marcotte
2016-02-09 14:15:23 -05:00
parent 187cd5e4ae
commit eff8ab3e0e
5 changed files with 21 additions and 7 deletions
+2 -4
View File
@@ -1,6 +1,6 @@
/* UIxPreferences.h - this file is part of SOGo
*
* Copyright (C) 2007-2015 Inverse inc.
* Copyright (C) 2007-2016 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -51,12 +51,10 @@
NSMutableDictionary *vacationOptions, *forwardOptions;
BOOL mailCustomFromEnabled;
BOOL forwardEnabled;
BOOL hasChanged;
}
//- (NSString *) userLongDateFormat;
- (BOOL) _isSieveServerAvailable;
- (id) _sieveClient;
+6
View File
@@ -144,6 +144,7 @@ static NSArray *reminderValues = nil;
}
mailCustomFromEnabled = [dd mailCustomFromEnabled];
forwardEnabled = [dd forwardEnabled];
hasChanged = NO;
}
@@ -2079,6 +2080,11 @@ static NSArray *reminderValues = nil;
return (mailCustomFromEnabled ? @"true" : @"false");
}
- (NSString *) forwardEnabled
{
return (forwardEnabled ? @"true" : @"false");
}
//
//
//