hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0b65301d3bbc9e843a45b6c399560ffb85718bc2
commit 0b65301d3bbc9e843a45b6c399560ffb85718bc2 Author: Vivek Ellur <[email protected]> Date: Fri Aug 28 16:14:31 2015 +0900 elm_conform: Port evas smart callbacks to eo Summary: Changed evas_object_smart_callback_add functions to eo_event_callback_add functions Signed-off-by: Vivek Ellur <[email protected]> Reviewers: cedric, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2996 --- src/lib/elm_conform.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 543aa7d..dd32aa4 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -348,9 +348,10 @@ _land_indicator_connect_cb(void *data) return ECORE_CALLBACK_RENEW; } -static void +static Eina_Bool _land_indicator_disconnected(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *conform = data; @@ -359,11 +360,13 @@ _land_indicator_disconnected(void *data, sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, _land_indicator_connect_cb, conform); + return EINA_TRUE; } -static void +static Eina_Bool _port_indicator_disconnected(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *conform = data; @@ -372,6 +375,7 @@ _port_indicator_disconnected(void *data, sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, _port_indicator_connect_cb, conform); + return EINA_TRUE; } static Evas_Object * @@ -407,8 +411,8 @@ _create_portrait_indicator(Evas_Object *obj) } elm_widget_sub_object_add(obj, port_indicator); - evas_object_smart_callback_add(port_indicator, "image.deleted", _port_indicator_disconnected, obj); - + eo_do(port_indicator, eo_event_callback_add + (ELM_PLUG_EVENT_IMAGE_DELETED, _port_indicator_disconnected, NULL)); evas_object_size_hint_min_set(port_indicator, -1, 0); evas_object_size_hint_max_set(port_indicator, -1, 0); @@ -448,8 +452,8 @@ _create_landscape_indicator(Evas_Object *obj) } elm_widget_sub_object_add(obj, land_indicator); - evas_object_smart_callback_add(land_indicator, "image.deleted",_land_indicator_disconnected, obj); - + eo_do(land_indicator, eo_event_callback_add + (ELM_PLUG_EVENT_IMAGE_DELETED, _land_indicator_disconnected, NULL)); evas_object_size_hint_min_set(land_indicator, -1, 0); evas_object_size_hint_max_set(land_indicator, -1, 0); return land_indicator; --
