jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=8ac8bb54f477eb153b4e37eb630273e0bfea77ec

commit 8ac8bb54f477eb153b4e37eb630273e0bfea77ec
Author: Avi Levin <avi.le...@samsung.com>
Date:   Wed May 13 14:47:09 2015 +0300

    elm_slideshow, elm_plug: porting evas smart callbacks to eo
---
 src/lib/elm_plug.c      |  6 +++---
 src/lib/elm_plug.eo     |  3 +--
 src/lib/elm_slideshow.c | 12 ++++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index d7f4448..c3c31aa 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
 {
    Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
    EINA_SAFETY_ON_NULL_RETURN(plug);
-   evas_object_smart_callback_call(plug, SIG_IMAGE_DELETED, NULL);
+   eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
    /* TODO: was a typo. Deprecated, remove in future releases: */
    evas_object_smart_callback_call(plug, "image.deleted", NULL);
 }
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
    EINA_SAFETY_ON_NULL_RETURN(plug);
 
    ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
-   evas_object_smart_callback_call(plug, SIG_IMAGE_RESIZED, &size);
+   eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_RESIZED, &size));
 }
 
 EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+   eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
NULL));
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_plug.eo b/src/lib/elm_plug.eo
index 9b41e68..b89be97 100644
--- a/src/lib/elm_plug.eo
+++ b/src/lib/elm_plug.eo
@@ -1,4 +1,4 @@
-class Elm.Plug (Elm.Widget)
+class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
 {
    eo_prefix: elm_obj_plug;
    data: null;
@@ -45,7 +45,6 @@ class Elm.Plug (Elm.Widget)
       Elm.Widget.on_focus;
    }
    events {
-      clicked;
       image,deleted;
       image,resized; [[ii]]
    }
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 87542c0..7d9c454 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -271,7 +271,8 @@ _on_slideshow_end(void *data,
    elm_layout_signal_emit(data, "anim,end", "slideshow");
 
    if (emission != NULL)
-     evas_object_smart_callback_call(data, SIG_TRANSITION_END, 
EO_OBJ(sd->current));
+     eo_do(data, eo_event_callback_call
+       (ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current)));
 }
 
 static Eina_Bool
@@ -480,7 +481,8 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, 
Elm_Slideshow_Item_Data *item)
 
    sd->previous = sd->current;
    sd->current = next;
-   evas_object_smart_callback_call(WIDGET(item), SIG_CHANGED, 
EO_OBJ(sd->current));
+   eo_do(WIDGET(item), eo_event_callback_call
+     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
 }
 
 EOLIAN static void
@@ -517,7 +519,8 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = next;
-   evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current));
+   eo_do(obj, eo_event_callback_call
+     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
 }
 
 EOLIAN static void
@@ -554,7 +557,8 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = prev;
-   evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current));
+   eo_do(obj, eo_event_callback_call
+     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
 }
 
 EOLIAN static const Eina_List*

-- 


Reply via email to