From 1c72554acc7b7390e65b487d2a428b6faea068b8 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 29 Feb 2016 11:38:38 +0000 Subject: [PATCH] Eo events: Migrate to the new eo event cb signature. --- src/bin/ui.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/bin/ui.c b/src/bin/ui.c index be5185f..e36fdaf 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -256,10 +256,9 @@ _ui_select(void) } static Eina_Bool -_ui_key(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, void *event_info) +_ui_key(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Key_Down *ev = event_info; + Evas_Event_Key_Down *ev = event->event_info; if (key_func) { @@ -290,10 +289,9 @@ static Evas_Coord down_x, down_y; static int down_menu_sel = 0; static Eina_Bool -_ui_mouse_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, void *event_info) +_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Down *ev = event_info; + Evas_Event_Mouse_Down *ev = event->event_info; if (ev->button != 1) return EINA_TRUE; if (menu_active) @@ -307,10 +305,9 @@ _ui_mouse_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, } static Eina_Bool -_ui_mouse_up(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, void *event_info) +_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Up *ev = event_info; + Evas_Event_Mouse_Up *ev = event->event_info; if (ev->button != 1) return EINA_TRUE; if (menu_active) @@ -333,10 +330,9 @@ _ui_mouse_up(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, } static Eina_Bool -_ui_mouse_move(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, void *event_info) +_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Move *ev = event_info; + Evas_Event_Mouse_Move *ev = event->event_info; if (ev->buttons != 1) return EINA_TRUE; if (menu_active)