[EGIT] [core/elementary] master 05/06: elm_photo: porting evas smart callbacks to eo

[Avi Levin]

jackdanielz pushed a commit to branch master.

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

commit 5ac56354a11f212253792edd007f302c801df4de
Author: Avi Levin <avi.le...@samsung.com>
Date:   Wed Apr 29 17:45:24 2015 +0300

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

diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
old mode 100644
new mode 100755
index 00c113d..fc214da
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
    ELM_PHOTO_DATA_GET(obj, sd);
 
    elm_object_scroll_freeze_pop(obj);
-   evas_object_smart_callback_call(obj, SIG_DRAG_END, NULL);
+   eo_do(obj, eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_END, 
NULL));
    sd->drag_started = EINA_FALSE;
 }
 
@@ -171,7 +171,8 @@ _long_press_cb(void *obj)
                   _drag_done_cb, NULL))
           {
              elm_object_scroll_freeze_push(obj);
-             evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL);
+             eo_do(obj, eo_event_callback_call
+               (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL));
              sd->drag_started = EINA_TRUE;
           }
      }
@@ -213,7 +214,7 @@ _mouse_up(void *data,
    ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
 
    if (!sd->drag_started)
-     evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+     eo_do(data, 
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
 }
 
 static inline int
@@ -241,12 +242,13 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
      (img, EVAS_CALLBACK_RESIZE, _icon_move_resize_cb, obj);
 }
 
-static void
+static Eina_Bool
 _on_thumb_done(void *data,
-               Evas_Object *obj EINA_UNUSED,
-               void *event EINA_UNUSED)
+      Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void 
*event_info EINA_UNUSED)
 {
    _elm_photo_internal_image_follow(data);
+
+   return EINA_TRUE;
 }
 
 EOLIAN static void
@@ -274,8 +276,8 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data 
*priv)
    evas_object_event_callback_add
      (priv->icon, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
 
-   evas_object_smart_callback_add
-     (priv->icon, "thumb,done", _on_thumb_done, obj);
+   eo_do(priv->icon, eo_event_callback_add
+     (ELM_ICON_EVENT_THUMB_DONE, _on_thumb_done, obj));
 
    _elm_photo_internal_image_follow(obj);
 
diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo
index 2ff4c7d..67c2c84 100644
--- a/src/lib/elm_photo.eo
+++ b/src/lib/elm_photo.eo
@@ -93,10 +93,5 @@ class Elm.Photo (Elm.Widget, Efl.File, 
Evas.Clickable_Interface, Evas.Draggable_
       Evas.Object_Smart.del;
       Elm.Widget.theme_apply;
    }
-   events {
-      clicked;
-      drag,start;
-      drag,end;
-   }
 
 }

--