From 258e384ca9d8a1af476507181a5c34853da55f4f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 7 Feb 2013 07:50:28 +0000 Subject: [PATCH] clean up config for fileman window remembers, finishing a job that I started last month SVN revision: 83711 --- src/bin/e_remember.c | 6 ++--- .../e_int_config_remembers.c | 27 +++++-------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 0e399a3ab..06dd2a638 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -602,13 +602,11 @@ _e_remember_cb_hook_eval_post_new_border(void *data __UNUSED__, void *border) if (!strncmp(bd->client.icccm.class, "e_fwin", 6)) { - if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS) && - (!e_config->remember_internal_fm_windows)) - return; + if (!e_config->remember_internal_fm_windows) return; } else { - if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS)) + if (!e_config->remember_internal_windows) return; } 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 b708a3da7..f1d5828ae 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;