hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix _e_popup_autoclose_key_down_cb 

- uses autoclose_popup->key_data as autoclose_popup->key_cb data
  key_data is provided at cb registration through e_popup_autoclose(…)
- re-enable _mixer_popup_key_down_cb
This commit is contained in:
Jérémy Zurcher 2013-03-30 10:07:05 +01:00
parent c66e21aa9a
commit cf2ef255c4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_popup.c
View File

@ -36,13 +36,13 @@ _e_popup_free(E_Popup *pop)
}
static Eina_Bool
_e_popup_autoclose_key_down_cb(void *data, int type EINA_UNUSED, void *event)
_e_popup_autoclose_key_down_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
Ecore_Event_Key *ev = event;
Eina_Bool del = EINA_TRUE;
if (autoclose_popup->key_cb)
del = !autoclose_popup->key_cb(data, ev);
del = !autoclose_popup->key_cb(autoclose_popup->key_data, ev);
if (del) _e_popup_autoclose_cleanup();
return ECORE_CALLBACK_RENEW;
}

1
src/modules/mixer/e_mod_main.c
View File

@ -467,7 +467,6 @@ _mixer_popup_key_down_cb(void *data, Ecore_Event_Key *ev)
E_Mixer_Instance *inst = data;
const char *keysym;
if (!inst) return ECORE_CALLBACK_PASS_ON;
keysym = ev->key;
if (strcmp(keysym, "Escape") == 0)
_mixer_popup_del(inst);