[EGIT] [core/elementary] master 09/24: elm_diskselector: porting evas smart callbacks to eo

[Avi Levin]

jackdanielz pushed a commit to branch master.

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

commit ea1f362d2f0573034a52236f9bf23b62bf25d3e2
Author: Avi Levin <avi.le...@samsung.com>
Date:   Thu May 7 18:14:27 2015 +0300

    elm_diskselector: porting evas smart callbacks to eo
---
 src/lib/elm_diskselector.c  | 24 +++++++++++++++---------
 src/lib/elm_diskselector.eo | 10 +++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 8433a88..a367f34 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -89,7 +89,8 @@ _item_select(Elm_Diskselector_Item_Data *it)
    _selected_item_indicate(sd->selected_item);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), 
eo_it);
-   evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
+   eo_do(WIDGET(it), eo_event_callback_call
+     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
 }
 
 static int
@@ -610,7 +611,8 @@ _item_click_cb(void *data,
      }
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), 
eo_it);
-   evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it);
+   eo_do(WIDGET(it), eo_event_callback_call
+     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it));
 }
 
 static char *
@@ -1096,31 +1098,35 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 
    if (!it) return;
    _item_select(it);
-   evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, EO_OBJ(it));
+   eo_do(data, eo_event_callback_call
+     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)));
 }
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   evas_object_smart_callback_call
-     (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
+   eo_do(obj, eo_event_callback_call
+     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
+     elm_diskselector_selected_item_get(obj)));
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   evas_object_smart_callback_call
-     (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
+   eo_do(obj, eo_event_callback_call
+     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
+     elm_diskselector_selected_item_get(obj)));
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   evas_object_smart_callback_call
-     (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
+   eo_do(obj, eo_event_callback_call
+     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP,
+     elm_diskselector_selected_item_get(obj)));
 }
 
 static void
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 2a6fb12..9c8ff86 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -1,5 +1,7 @@
 class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
-                        Elm_Interface_Atspi_Widget_Action)
+                        Elm_Interface_Atspi_Widget_Action,
+                        Evas.Clickable_Interface, Evas.Scrollable_Interface,
+                        Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_diskselector;
    methods {
@@ -251,12 +253,6 @@ class Elm.Diskselector (Elm.Widget, 
Elm_Interface_Scrollable,
       Elm_Interface_Atspi_Widget_Action.elm_actions.get;
    }
    events {
-      selected;
-      clicked;
-      scroll,anim,start;
-      scroll,anim,stop;
-      scroll,drag,start;
-      scroll,drag,stop;
       language,changed;
       access,changed;
       focused;

--