discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=653e671bf52fe1832ad45214067a65df93321b2c
commit 653e671bf52fe1832ad45214067a65df93321b2c Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Thu Oct 27 10:35:01 2016 -0400 Revert "prevent editing of session recovery remembers" This reverts commit 890008cdf2357be069e7cff44e3b030c7e67f2aa. --- src/bin/e_int_client_remember.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c index 5a63a30..3de6000 100644 --- a/src/bin/e_int_client_remember.c +++ b/src/bin/e_int_client_remember.c @@ -23,7 +23,6 @@ struct _E_Config_Dialog_Data { E_Client *client; E_Remember *rem; - E_Remember *backup_rem; /*- BASIC -*/ int mode; int warned; @@ -142,9 +141,6 @@ _fill_data(E_Config_Dialog_Data *cfdata) else rem = cfdata->rem; - if (ec && rem && (rem->apply & E_REMEMBER_APPLY_UUID)) - cfdata->backup_rem = rem = e_remember_find_usable(ec); - if (rem) { if (rem->name && rem->name[0]) @@ -320,11 +316,10 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) if (cfdata->client) { - E_Remember *rem = cfdata->backup_rem ?: cfdata->client->remember; - if (!cfdata->applied && rem) + if (!cfdata->applied && cfdata->client->remember) { - e_remember_unuse(rem); - e_remember_del(rem); + e_remember_unuse(cfdata->client->remember); + e_remember_del(cfdata->client->remember); e_config_save_queue(); } @@ -418,7 +413,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata { /* Actually take our cfdata settings and apply them in real life */ E_Client *ec = cfdata->client; - E_Remember *rem = cfdata->backup_rem ?: ec->remember; + E_Remember *rem = ec->remember; if (cfdata->mode == MODE_NOTHING) { @@ -426,8 +421,8 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata { e_remember_unuse(rem); e_remember_del(rem); - e_config_save_queue(); } + e_config_save_queue(); return 1; } @@ -436,8 +431,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata rem = e_remember_new(); if (rem) { - if ((!ec->remember) || (!(ec->remember->apply & E_REMEMBER_APPLY_UUID))) - ec->remember = rem; + ec->remember = rem; cfdata->applied = 0; } else @@ -456,8 +450,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata rem->apply = cfdata->mode; rem->apply_first_only = 0; - if (ec->remember == rem) - e_remember_use(rem); + e_remember_use(rem); e_remember_update(ec); cfdata->applied = 1; e_config_save_queue(); @@ -470,7 +463,7 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd E_Client *ec = cfdata->client; E_Remember *rem; - if (ec) rem = cfdata->backup_rem ?: ec->remember; + if (ec) rem = ec->remember; else rem = cfdata->rem; if (!rem) @@ -631,9 +624,8 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd { _check_matches(rem, 1); rem->keep_settings = 0; - if ((!ec->remember) || (!(ec->remember->apply & E_REMEMBER_APPLY_UUID))) - ec->remember = rem; - e_remember_update(ec); + cfdata->client->remember = rem; + e_remember_update(cfdata->client); cfdata->applied = 1; } rem->keep_settings = cfdata->remember.keep_settings; --