forked from enlightenment/enlightenment
clean up config for fileman window remembers, finishing a job that I started last month
SVN revision: 83711
This commit is contained in:
parent
16e1ac105e
commit
258e384ca9
|
@ -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 (!strncmp(bd->client.icccm.class, "e_fwin", 6))
|
||||||
{
|
{
|
||||||
if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS) &&
|
if (!e_config->remember_internal_fm_windows) return;
|
||||||
(!e_config->remember_internal_fm_windows))
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS))
|
if (!e_config->remember_internal_windows)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -80,8 +80,8 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||||
cfdata->remember_dialogs = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS);
|
cfdata->remember_dialogs = e_config->remember_internal_windows;
|
||||||
cfdata->remember_fm_wins = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
|
cfdata->remember_fm_wins = e_config->remember_internal_fm_windows;
|
||||||
|
|
||||||
return cfdata;
|
return cfdata;
|
||||||
}
|
}
|
||||||
|
@ -89,34 +89,21 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
|
||||||
static void
|
static void
|
||||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
E_FREE(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
return ((cfdata->remember_dialogs) &&
|
return ((cfdata->remember_dialogs == e_config->remember_internal_windows) &&
|
||||||
!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS)) ||
|
(cfdata->remember_fm_wins == e_config->remember_internal_fm_windows));
|
||||||
((!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));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
if (cfdata->remember_dialogs)
|
e_config->remember_internal_windows = cfdata->remember_dialogs;
|
||||||
e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS;
|
e_config->remember_internal_fm_windows = cfdata->remember_fm_wins;
|
||||||
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_save_queue();
|
e_config_save_queue();
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue