enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "correctly handle applying of non-SR remember in remember config" 

This reverts commit 62068912e9.
This commit is contained in:
Mike Blumenkrantz 2016-10-27 10:34:05 -04:00
parent a9d0a27ea3
commit 98bc594299
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/e_int_client_remember.c
View File

@ -418,10 +418,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 */ /* Actually take our cfdata settings and apply them in real life */
E_Client *ec = cfdata->client; E_Client *ec = cfdata->client;
E_Remember *rem = ec->remember; E_Remember *rem = cfdata->backup_rem ?: ec->remember;
if (rem && (rem->apply & E_REMEMBER_APPLY_UUID))
rem = cfdata->backup_rem;
if (cfdata->mode == MODE_NOTHING) if (cfdata->mode == MODE_NOTHING)
{ {
@ -437,10 +434,14 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
if (!rem) if (!rem)
{ {
rem = e_remember_new(); rem = e_remember_new();
if (!rem) return 0; if (rem)
cfdata->applied = 0; {
if (ec->remember && (ec->remember->apply & E_REMEMBER_APPLY_UUID)) if ((!ec->remember) || (!(ec->remember->apply & E_REMEMBER_APPLY_UUID)))
cfdata->backup_rem = rem; ec->remember = rem;
cfdata->applied = 0;
}
else
return 0;
} }
e_remember_default_match_set(rem, cfdata->client); e_remember_default_match_set(rem, cfdata->client);