cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4b160aaacee3238307916918acac9366fcc94d5b
commit 4b160aaacee3238307916918acac9366fcc94d5b Author: Vivek Ellur <vivek.el...@samsung.com> Date: Wed Sep 23 15:23:46 2015 -0700 elc_popup: ported eo_event callbacks to use eo_event arrays Summary: Changed eo_event_callback_add to eo_event_callback_array_add function Signed-off-by: Vivek Ellur <vivek.el...@samsung.com> Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3099 Signed-off-by: Cedric BAIL <ced...@osg.samsung.com> --- src/lib/elc_popup.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 73a1302..a1d7849 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -44,12 +44,23 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); +static Eina_Bool +_block_clicked_cb(void *data, Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED); +static Eina_Bool +_timeout_cb(void *data, Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED); static const Elm_Action key_actions[] = { {"move", _key_action_move}, {NULL, NULL} }; +EO_CALLBACKS_ARRAY_DEFINE(_notify_cb, + { ELM_NOTIFY_EVENT_BLOCK_CLICKED, _block_clicked_cb }, + { ELM_NOTIFY_EVENT_TIMEOUT, _timeout_cb } +); + static void _on_content_del(void *data, Evas *e, Evas_Object *obj, void *event_info); EOLIAN static Eina_Bool @@ -199,10 +210,8 @@ _elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd) evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_RESIZE, _parent_geom_cb, obj); evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_MOVE, _parent_geom_cb, obj); - eo_do(sd->notify, eo_event_callback_del( - ELM_NOTIFY_EVENT_BLOCK_CLICKED, _block_clicked_cb, obj)); - eo_do(sd->notify, eo_event_callback_del( - ELM_NOTIFY_EVENT_TIMEOUT, _timeout_cb, obj)); + eo_do(sd->notify, + eo_event_callback_array_del(_notify_cb(), obj)); evas_object_event_callback_del (sd->content, EVAS_CALLBACK_DEL, _on_content_del); evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show); @@ -1501,11 +1510,8 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) _size_hints_changed_cb, priv->main_layout); priv->content_text_wrap_type = ELM_WRAP_MIXED; - eo_do(priv->notify, eo_event_callback_add - (ELM_NOTIFY_EVENT_BLOCK_CLICKED,_block_clicked_cb, obj)); - - eo_do(priv->notify, eo_event_callback_add - (ELM_NOTIFY_EVENT_TIMEOUT, _timeout_cb, obj)); + eo_do(priv->notify, + eo_event_callback_array_add(_notify_cb(), obj)); elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_can_focus_set(priv->main_layout, EINA_TRUE); --