diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2013-02-07 07:50:28 +0000 |
|---|---|---|
| committer | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2013-02-07 07:50:28 +0000 |
| commit | 258e384ca9d8a1af476507181a5c34853da55f4f (patch) | |
| tree | 1e1bc785e20cfe9cba81418a8db28ee95548eefe /src/modules | |
| parent | 16e1ac105e8268b572c174a45fa2d86fcc83b6aa (diff) | |
| download | enlightenment-258e384ca9d8a1af476507181a5c34853da55f4f.tar.gz | |
clean up config for fileman window remembers, finishing a job that I started last month
SVN revision: 83711
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/conf_window_remembers/e_int_config_remembers.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c index b708a3da74..f1d5828ae7 100644 --- a/src/modules/conf_window_remembers/e_int_config_remembers.c +++ b/src/modules/conf_window_remembers/e_int_config_remembers.c @@ -80,8 +80,8 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) E_Config_Dialog_Data *cfdata; cfdata = E_NEW(E_Config_Dialog_Data, 1); - cfdata->remember_dialogs = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS); - cfdata->remember_fm_wins = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); + cfdata->remember_dialogs = e_config->remember_internal_windows; + cfdata->remember_fm_wins = e_config->remember_internal_fm_windows; return cfdata; } @@ -89,34 +89,21 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - E_FREE(cfdata); + free(cfdata); } static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - return ((cfdata->remember_dialogs) && - !(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS)) || - ((!cfdata->remember_dialogs) && - (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS)) || - ((cfdata->remember_fm_wins) && - !(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS)) || - ((!cfdata->remember_fm_wins) && - (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS)); + return ((cfdata->remember_dialogs == e_config->remember_internal_windows) && + (cfdata->remember_fm_wins == e_config->remember_internal_fm_windows)); } static int _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - if (cfdata->remember_dialogs) - e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS; - else - e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS; - - if (cfdata->remember_fm_wins) - e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_FM_WINS; - else - e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_FM_WINS; + e_config->remember_internal_windows = cfdata->remember_dialogs; + e_config->remember_internal_fm_windows = cfdata->remember_fm_wins; e_config_save_queue(); return 1; |