jeyzu pushed a commit to branch master.
commit cf2ef255c484310427b4d44debfef967b29d8a57
Author: Jérémy Zurcher <[email protected]>
Date: Sat Mar 30 10:07:05 2013 +0100
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
---
src/bin/e_popup.c | 4 ++--
src/modules/mixer/e_mod_main.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index 312bf17..3d76029 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -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;
}
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 5fd8f14..27ea786 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -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);
--
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
