7 files changed, 28 insertions, 39 deletions

diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 28fcd55..4cbf725 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -5149,8 +5149,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(obj, sd);
    /* here we need to emit the signal that the elm_scroller would have done */
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(obj, "scroll", NULL);
 
    if (sd->have_selection)
      _update_selection_handler(obj);
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 39e6c2a..a162fb7 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3714,28 +3714,28 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "anim,start", NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "anim,stop", NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "drag,start", NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
 static void
@@ -3777,7 +3777,7 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(obj, "changed", NULL);
 }
 
 static int
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 09dd0df..1c0864e 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5541,35 +5541,35 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "anim,start", NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "anim,stop", NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "drag,start", NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(obj, "changed", NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
 static void
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 6590616..ea509c8 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1307,8 +1307,7 @@ _scr_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->scr_timer = NULL;
-   efl_event_callback_legacy_call
-     (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
+   evas_object_smart_callback_call(sd->obj, "drag,stop", NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1321,12 +1320,10 @@ _scroll_cb(Evas_Object *obj,
 
    if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
    else
-      efl_event_callback_legacy_call
-        (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
+      evas_object_smart_callback_call(sd->obj, "drag,stop", NULL);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
-   efl_event_callback_legacy_call
-     (sd->obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(sd->obj, "scroll", NULL);
 }
 
 static void
@@ -1335,8 +1332,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   efl_event_callback_legacy_call
-     (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
+   evas_object_smart_callback_call(sd->obj, "anim,start", NULL);
 }
 
 static void
@@ -1345,8 +1341,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   efl_event_callback_legacy_call
-     (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
+   evas_object_smart_callback_call(sd->obj, "anim,stop", NULL);
 }
 
 static Eina_Bool
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 64074a6..1468d81 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1232,8 +1232,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
           }
         break;
      }
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_CHANGED, (void *) &event);
+   evas_object_smart_callback_call(obj, "scroll", &event);
 }
 
 EOLIAN static void
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 6c84fa5..630e900 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -487,8 +487,7 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(obj, "scroll", NULL);
 }
 
 static void
@@ -523,32 +522,29 @@ static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "anim,start", NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "anim,stop", NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "drag,start", NULL);
 }
 
+
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call
-     (obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
 static void
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index a54c77a..dd15fa9 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2235,21 +2235,21 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
+   evas_object_smart_callback_call(obj, "scroll", NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "anim,start", NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "anim,stop", NULL);
 }
 
 static void
@@ -2259,14 +2259,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
    ELM_TOOLBAR_DATA_GET(obj, sd);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
+   evas_object_smart_callback_call(obj, "drag,start", NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
+   evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
 static void