rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=ecf1d6228004e906a72ecca127d9facc22822072

commit ecf1d6228004e906a72ecca127d9facc22822072
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Mon Apr 4 19:20:07 2016 +0300

    demo: update every demo object callbacks
    
    to a new architecture we have
---
 src/bin/ui/live_view/elementary/live_bg.c          |  9 ++--
 src/bin/ui/live_view/elementary/live_bubble.c      |  7 ++-
 src/bin/ui/live_view/elementary/live_button.c      |  7 ++-
 src/bin/ui/live_view/elementary/live_calendar.c    |  7 ++-
 src/bin/ui/live_view/elementary/live_check.c       |  1 -
 src/bin/ui/live_view/elementary/live_clock.c       |  7 ++-
 .../ui/live_view/elementary/live_colorselector.c   |  7 ++-
 src/bin/ui/live_view/elementary/live_ctxpopup.c    |  7 ++-
 .../ui/live_view/elementary/live_custom_layout.c   |  7 ++-
 src/bin/ui/live_view/elementary/live_datetime.c    |  7 ++-
 src/bin/ui/live_view/elementary/live_entry.c       |  7 ++-
 src/bin/ui/live_view/elementary/live_frame.c       | 37 +++++----------
 src/bin/ui/live_view/elementary/live_gengrid.c     | 48 +++++++-------------
 src/bin/ui/live_view/elementary/live_genlist.c     | 47 +++++++------------
 src/bin/ui/live_view/elementary/live_label.c       |  7 ++-
 src/bin/ui/live_view/elementary/live_layout.c      |  7 ++-
 src/bin/ui/live_view/elementary/live_list.c        | 36 +++++----------
 .../live_view/elementary/live_multibuttonentry.c   | 43 ++++++------------
 src/bin/ui/live_view/elementary/live_naviframe.c   | 53 ++++++++++------------
 src/bin/ui/live_view/elementary/live_notify.c      | 29 +++---------
 src/bin/ui/live_view/elementary/live_panel.c       |  7 ++-
 src/bin/ui/live_view/elementary/live_panes.c       |  7 ++-
 src/bin/ui/live_view/elementary/live_popup.c       | 47 +++++++------------
 src/bin/ui/live_view/elementary/live_progressbar.c |  7 ++-
 src/bin/ui/live_view/elementary/live_scroller.c    | 34 ++++----------
 .../ui/live_view/elementary/live_segment_control.c | 44 ++++++------------
 src/bin/ui/live_view/elementary/live_separator.c   |  7 ++-
 src/bin/ui/live_view/elementary/live_slider.c      |  7 ++-
 src/bin/ui/live_view/elementary/live_spinner.c     |  7 ++-
 src/bin/ui/live_view/elementary/live_toolbar.c     |  7 ++-
 .../ui/live_view/elementary/live_widget_common.c   | 11 -----
 31 files changed, 202 insertions(+), 363 deletions(-)

diff --git a/src/bin/ui/live_view/elementary/live_bg.c 
b/src/bin/ui/live_view/elementary/live_bg.c
index ce0ea37..3cd589a 100644
--- a/src/bin/ui/live_view/elementary/live_bg.c
+++ b/src/bin/ui/live_view/elementary/live_bg.c
@@ -19,8 +19,6 @@
 
 #include "live_elementary_widgets.h"
 
-
-
 Evas_Object *
 widget_bg_create(Evas_Object *parent, const Group *group)
 {
@@ -30,10 +28,9 @@ widget_bg_create(Evas_Object *parent, const Group *group)
 
    Evas_Object *object = elm_bg_add(parent);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_bubble.c 
b/src/bin/ui/live_view/elementary/live_bubble.c
index 39a9d35..3035ac9 100644
--- a/src/bin/ui/live_view/elementary/live_bubble.c
+++ b/src/bin/ui/live_view/elementary/live_bubble.c
@@ -50,10 +50,9 @@ widget_bubble_create(Evas_Object *parent, const Group *group)
    if (strcmp(group->class, "base") != 0)
      elm_bubble_pos_set(object, _bubble_pos_get(group->class));
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_button.c 
b/src/bin/ui/live_view/elementary/live_button.c
index eea6a73..a0f8e22 100644
--- a/src/bin/ui/live_view/elementary/live_button.c
+++ b/src/bin/ui/live_view/elementary/live_button.c
@@ -28,10 +28,9 @@ widget_button_create(Evas_Object *parent, const Group *group)
 
    Evas_Object *object = elm_button_add(parent);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_calendar.c 
b/src/bin/ui/live_view/elementary/live_calendar.c
index 3a73c63..98579dd 100644
--- a/src/bin/ui/live_view/elementary/live_calendar.c
+++ b/src/bin/ui/live_view/elementary/live_calendar.c
@@ -37,10 +37,9 @@ widget_calendar_create(Evas_Object *parent, const Group 
*group)
    elm_calendar_mark_add(object, "checked", &saturday,
                                 ELM_CALENDAR_WEEKLY);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_check.c 
b/src/bin/ui/live_view/elementary/live_check.c
index 4f505a9..15a682f 100644
--- a/src/bin/ui/live_view/elementary/live_check.c
+++ b/src/bin/ui/live_view/elementary/live_check.c
@@ -31,7 +31,6 @@ widget_check_create(Evas_Object *parent, const Group *group)
    evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
    evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
    evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_clock.c 
b/src/bin/ui/live_view/elementary/live_clock.c
index 2fc8e16..0ec73bb 100644
--- a/src/bin/ui/live_view/elementary/live_clock.c
+++ b/src/bin/ui/live_view/elementary/live_clock.c
@@ -55,10 +55,9 @@ widget_clock_create(Evas_Object *parent, const Group *group)
         elm_clock_show_am_pm_set(object, true);
      }
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_colorselector.c 
b/src/bin/ui/live_view/elementary/live_colorselector.c
index aa96b9d..69dc5e9 100644
--- a/src/bin/ui/live_view/elementary/live_colorselector.c
+++ b/src/bin/ui/live_view/elementary/live_colorselector.c
@@ -45,10 +45,9 @@ widget_colorselector_create(Evas_Object *parent, const Group 
*group)
         free(style_parsed);
      }
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, style_name);
 
diff --git a/src/bin/ui/live_view/elementary/live_ctxpopup.c 
b/src/bin/ui/live_view/elementary/live_ctxpopup.c
index 3f998c2..686c4e6 100644
--- a/src/bin/ui/live_view/elementary/live_ctxpopup.c
+++ b/src/bin/ui/live_view/elementary/live_ctxpopup.c
@@ -212,10 +212,9 @@ widget_ctxpopup_create(Evas_Object *parent, const Group 
*group)
    elm_list_go(list);
 
    evas_object_data_set(list, "style_name", group->style);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, list);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
list);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, list);
-   evas_object_event_callback_add(list, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(list, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(list, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(list, SIGNAL_DEMO_SIGNAL_SEND, send_signal, 
NULL);
 
    return list;
 }
diff --git a/src/bin/ui/live_view/elementary/live_custom_layout.c 
b/src/bin/ui/live_view/elementary/live_custom_layout.c
index 6f14402..1af47a8 100644
--- a/src/bin/ui/live_view/elementary/live_custom_layout.c
+++ b/src/bin/ui/live_view/elementary/live_custom_layout.c
@@ -35,10 +35,9 @@ layout_custom_create(Evas_Object *parent, const Group *group)
         return NULL;
      }
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, obj);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
obj);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, obj);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(obj, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(obj, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(obj, SIGNAL_DEMO_SIGNAL_SEND, send_signal, 
NULL);
 
    return obj;
 }
diff --git a/src/bin/ui/live_view/elementary/live_datetime.c 
b/src/bin/ui/live_view/elementary/live_datetime.c
index 158a8d5..27a3d16 100644
--- a/src/bin/ui/live_view/elementary/live_datetime.c
+++ b/src/bin/ui/live_view/elementary/live_datetime.c
@@ -28,10 +28,9 @@ widget_datetime_create(Evas_Object *parent, const Group 
*group)
 
    Evas_Object *object = elm_datetime_add(parent);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
    return object;
diff --git a/src/bin/ui/live_view/elementary/live_entry.c 
b/src/bin/ui/live_view/elementary/live_entry.c
index 8cb805f..6fa40c3 100644
--- a/src/bin/ui/live_view/elementary/live_entry.c
+++ b/src/bin/ui/live_view/elementary/live_entry.c
@@ -127,10 +127,9 @@ widget_entry_create(Evas_Object *parent, const Group 
*group)
         eina_stringshare_del(emoticon_type);
      }
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_frame.c 
b/src/bin/ui/live_view/elementary/live_frame.c
index b559956..c84a936 100644
--- a/src/bin/ui/live_view/elementary/live_frame.c
+++ b/src/bin/ui/live_view/elementary/live_frame.c
@@ -21,16 +21,15 @@
 #include "widget_macro.h"
 
 static void
-_on_frame_swallow_check(void *data,
-                        Evas_Object *obj __UNUSED__,
+_on_frame_swallow_check(void *data __UNUSED__,
+                        Evas_Object *obj,
                         void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Evas_Object *frame_obj = NULL;
    Evas_Object *content = NULL;
 
-   assert(data != NULL);
-   Eina_List *frame_list = elm_box_children_get(data);
+   Eina_List *frame_list = elm_box_children_get(obj);
 
    EINA_LIST_FREE(frame_list, frame_obj)
      {
@@ -69,23 +68,23 @@ _on_frame_swallow_check(void *data,
 }
 
 static void
-_on_frame_text_check(void *data,
-                     Evas_Object *obj __UNUSED__,
+_on_frame_text_check(void *data __UNUSED__,
+                     Evas_Object *obj,
                      void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Evas_Object *frame_obj = NULL;
 
    assert(data != NULL);
-   Eina_List *frame_list = elm_box_children_get(data);
+   Eina_List *frame_list = elm_box_children_get(obj);
 
    EINA_LIST_FREE(frame_list, frame_obj)
      elm_object_part_text_set(frame_obj, part->name, part->text_content);
 }
 
 static void
-_frame_send_signal(void *data,
-                   Evas_Object *obj __UNUSED__,
+_frame_send_signal(void *data __UNUSED__,
+                   Evas_Object *obj,
                    void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
@@ -93,7 +92,7 @@ _frame_send_signal(void *data,
 
    assert(data != NULL);
 
-   Eina_List* frame_list = elm_box_children_get(data);
+   Eina_List* frame_list = elm_box_children_get(obj);
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
@@ -102,17 +101,6 @@ _frame_send_signal(void *data,
      elm_layout_signal_emit(frame_obj, sig->sig_name, sig->source_name);
 }
 
-void
-_demo_frame_del(void *data __UNUSED__,
-                Evas *evas __UNUSED__,
-                Evas_Object *object,
-                void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_frame_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_frame_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_frame_send_signal, object);
-}
-
 Evas_Object *
 widget_frame_create(Evas_Object *parent, const Group *group)
 {
@@ -132,10 +120,9 @@ widget_frame_create(Evas_Object *parent, const Group 
*group)
    elm_box_pack_end(object, frame);
    elm_object_style_set(frame, group->style);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_frame_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_frame_text_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_frame_send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, _demo_frame_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_frame_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
_on_frame_text_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_frame_send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_gengrid.c 
b/src/bin/ui/live_view/elementary/live_gengrid.c
index b09f489..86e7ff2 100644
--- a/src/bin/ui/live_view/elementary/live_gengrid.c
+++ b/src/bin/ui/live_view/elementary/live_gengrid.c
@@ -21,19 +21,18 @@
 
 static void
 _on_gengrid_swallow_check(void *data __UNUSED__,
-                          Evas_Object *obj __UNUSED__,
-                          void *ei __UNUSED__)
+                          Evas_Object *obj,
+                          void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *)data;
-   Eina_List *part_list = evas_object_data_get(object, SWALLOW_LIST);
+   Eina_List *part_list = evas_object_data_get(obj, SWALLOW_LIST);
 
    if (!eina_list_data_find(part_list, part->name))
      part_list =  eina_list_append(part_list, part);
-   evas_object_data_set(object, SWALLOW_LIST, part_list);
+   evas_object_data_set(obj, SWALLOW_LIST, part_list);
 
    Elm_Object_Item *item = NULL;
-   item = elm_gengrid_first_item_get(object);
+   item = elm_gengrid_first_item_get(obj);
    while (item)
      {
         elm_gengrid_item_update(item);
@@ -43,19 +42,18 @@ _on_gengrid_swallow_check(void *data __UNUSED__,
 
 static void
 _on_gengrid_text_check(void *data __UNUSED__,
-                       Evas_Object *obj __UNUSED__,
-                       void *ei __UNUSED__)
+                       Evas_Object *obj,
+                       void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *)data;
-   Eina_List *part_list = evas_object_data_get(object, TEXT_LIST);
+   Eina_List *part_list = evas_object_data_get(obj, TEXT_LIST);
 
    if (!eina_list_data_find(part_list, part->name))
      part_list =  eina_list_append(part_list, part);
-   evas_object_data_set(object, TEXT_LIST, part_list);
+   evas_object_data_set(obj, TEXT_LIST, part_list);
 
    Elm_Object_Item *item = NULL;
-   item = elm_gengrid_first_item_get(object);
+   item = elm_gengrid_first_item_get(obj);
    while (item)
      {
         elm_gengrid_item_update(item);
@@ -64,16 +62,16 @@ _on_gengrid_text_check(void *data __UNUSED__,
 }
 
 static void
-_gengrid_send_signal(void *data,
-                     Evas_Object *obj __UNUSED__,
-                     void *ei __UNUSED__)
+_gengrid_send_signal(void *data __UNUSED__,
+                     Evas_Object *obj,
+                     void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
    Elm_Object_Item *item = NULL;
 
    assert(data != NULL);
 
-   item = elm_gengrid_first_item_get(data);
+   item = elm_gengrid_first_item_get(obj);
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
@@ -199,17 +197,6 @@ _create_gengrid(Evas_Object *obj, Eina_Bool item_style, 
const char *style)
 }
 /*********** GEN GRID CREATING FUNCTIONS ****END*********/
 
-void
-_demo_gengrid_del(void *data __UNUSED__,
-                  Evas *evas __UNUSED__,
-                  Evas_Object *object,
-                  void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_gengrid_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_gengrid_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_gengrid_send_signal, object);
-}
-
 Evas_Object *
 widget_gengrid_create(Evas_Object *parent, const Group *group)
 {
@@ -225,10 +212,9 @@ widget_gengrid_create(Evas_Object *parent, const Group 
*group)
    item_style = strcmp(group->class, "item") == 0;
    object = _create_gengrid(parent, item_style, group->style);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_gengrid_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_gengrid_text_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_gengrid_send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
_demo_gengrid_del, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_gengrid_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
_on_gengrid_text_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_gengrid_send_signal, NULL);
 
    evas_object_data_set(object, SWALLOW_LIST, swallow_list);
    evas_object_data_set(object, TEXT_LIST, text_list);
diff --git a/src/bin/ui/live_view/elementary/live_genlist.c 
b/src/bin/ui/live_view/elementary/live_genlist.c
index 6040c4a..e7ea146 100644
--- a/src/bin/ui/live_view/elementary/live_genlist.c
+++ b/src/bin/ui/live_view/elementary/live_genlist.c
@@ -22,19 +22,18 @@
 
 static void
 _on_genlist_swallow_check(void *data __UNUSED__,
-                          Evas_Object *obj __UNUSED__,
-                          void *ei __UNUSED__)
+                          Evas_Object *obj,
+                          void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *)data;
-   Eina_List *part_list = evas_object_data_get(object, SWALLOW_LIST);
+   Eina_List *part_list = evas_object_data_get(obj, SWALLOW_LIST);
 
    if (!eina_list_data_find(part_list, part->name))
      part_list =  eina_list_append(part_list, part);
-   evas_object_data_set(object, SWALLOW_LIST, part_list);
+   evas_object_data_set(obj, SWALLOW_LIST, part_list);
 
    Elm_Object_Item *item = NULL;
-   item = elm_genlist_first_item_get(object);
+   item = elm_genlist_first_item_get(obj);
    while (item)
      {
         elm_genlist_item_update(item);
@@ -43,20 +42,19 @@ _on_genlist_swallow_check(void *data __UNUSED__,
 }
 
 static void
-_on_genlist_text_check(void *data,
-                       Evas_Object *obj __UNUSED__,
+_on_genlist_text_check(void *data __UNUSED__,
+                       Evas_Object *obj,
                        void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *)data;
-   Eina_List *part_list = evas_object_data_get(object, TEXT_LIST);
+   Eina_List *part_list = evas_object_data_get(obj, TEXT_LIST);
 
    if (!eina_list_data_find(part_list, part->name))
      part_list =  eina_list_append(part_list, part);
-   evas_object_data_set(object, TEXT_LIST, part_list);
+   evas_object_data_set(obj, TEXT_LIST, part_list);
 
    Elm_Object_Item *item = NULL;
-   item = elm_genlist_first_item_get(object);
+   item = elm_genlist_first_item_get(obj);
    while (item)
      {
         elm_genlist_item_update(item);
@@ -65,16 +63,16 @@ _on_genlist_text_check(void *data,
 }
 
 static void
-_genlist_send_signal(void *data,
-                     Evas_Object *obj __UNUSED__,
-                     void *ei __UNUSED__)
+_genlist_send_signal(void *data __UNUSED__,
+                     Evas_Object *obj,
+                     void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
    Elm_Object_Item *item = NULL;
 
    assert(data != NULL);
 
-   item = elm_genlist_first_item_get(data);
+   item = elm_genlist_first_item_get(obj);
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
@@ -289,16 +287,6 @@ _create_genlist(Evas_Object *obj, const char *class, const 
char *style)
 }
 
 /*********** GEN LIST CREATING FUNCTIONS ****END*********/
-void
-_demo_genlist_del(void *data __UNUSED__,
-                  Evas *evas __UNUSED__,
-                  Evas_Object *object,
-                  void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_genlist_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_genlist_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_genlist_send_signal, object);
-}
 
 Evas_Object *
 widget_genlist_create(Evas_Object *parent, const Group *group)
@@ -314,10 +302,9 @@ widget_genlist_create(Evas_Object *parent, const Group 
*group)
    object = _create_genlist(parent, group->class, group->style);
    evas_object_show(object);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_genlist_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_genlist_text_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_genlist_send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
_demo_genlist_del, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_genlist_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
_on_genlist_text_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_genlist_send_signal, NULL);
 
    evas_object_data_set(object, SWALLOW_LIST, swallow_list);
    evas_object_data_set(object, TEXT_LIST, text_list);
diff --git a/src/bin/ui/live_view/elementary/live_label.c 
b/src/bin/ui/live_view/elementary/live_label.c
index 61fb305..d13104c 100644
--- a/src/bin/ui/live_view/elementary/live_label.c
+++ b/src/bin/ui/live_view/elementary/live_label.c
@@ -32,10 +32,9 @@ widget_label_create(Evas_Object *parent, const Group *group)
    elm_label_slide_duration_set(object, 0.5);
    elm_label_slide_mode_set(object, ELM_LABEL_SLIDE_MODE_ALWAYS);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_layout.c 
b/src/bin/ui/live_view/elementary/live_layout.c
index 7315273..b9012b1 100644
--- a/src/bin/ui/live_view/elementary/live_layout.c
+++ b/src/bin/ui/live_view/elementary/live_layout.c
@@ -30,10 +30,9 @@ widget_layout_create(Evas_Object *parent, const Group *group)
    Evas_Object *object = elm_layout_add(parent);
    elm_layout_theme_set(object, "layout", group->class, group->style);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_list.c 
b/src/bin/ui/live_view/elementary/live_list.c
index 26ba442..e9a063a 100644
--- a/src/bin/ui/live_view/elementary/live_list.c
+++ b/src/bin/ui/live_view/elementary/live_list.c
@@ -20,14 +20,13 @@
 #include "live_elementary_widgets.h"
 
 static void
-_on_list_swallow_check(void *data,
+_on_list_swallow_check(void *data __UNUSED__,
                        Evas_Object *obj,
                        void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *) data;
 
-   Elm_Object_Item *item = elm_list_first_item_get(object);
+   Elm_Object_Item *item = elm_list_first_item_get(obj);
 
    const char *part_name = part->name;
 
@@ -71,14 +70,13 @@ _on_list_swallow_check(void *data,
 }
 
 static void
-_on_list_text_check(void *data ,
-                    Evas_Object *obj __UNUSED__,
+_on_list_text_check(void *data __UNUSED__,
+                    Evas_Object *obj,
                     void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *) data;
 
-   Elm_Object_Item *item = elm_list_first_item_get(object);
+   Elm_Object_Item *item = elm_list_first_item_get(obj);
 
    while (item)
      {
@@ -88,8 +86,8 @@ _on_list_text_check(void *data ,
 }
 
 static void
-_list_send_signal(void *data,
-                  Evas_Object *obj __UNUSED__,
+_list_send_signal(void *data __UNUSED__,
+                  Evas_Object *obj,
                   void *ei __UNUSED__)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
@@ -97,7 +95,7 @@ _list_send_signal(void *data,
 
    assert(data != NULL);
 
-   item = elm_list_first_item_get(data);
+   item = elm_list_first_item_get(obj);
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
@@ -109,17 +107,6 @@ _list_send_signal(void *data,
      }
 }
 
-void
-_demo_list_del(void *data __UNUSED__,
-               Evas *evas __UNUSED__,
-               Evas_Object *object,
-               void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_list_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_list_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_list_send_signal, object);
-}
-
 Evas_Object *
 widget_list_create(Evas_Object *parent, const Group *group)
 {
@@ -142,10 +129,9 @@ widget_list_create(Evas_Object *parent, const Group *group)
    else
      elm_list_mode_set(object, ELM_LIST_SCROLL);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_list_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_list_text_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_list_send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, _demo_list_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_list_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
_on_list_text_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_list_send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_multibuttonentry.c 
b/src/bin/ui/live_view/elementary/live_multibuttonentry.c
index 7c29c88..394d962 100644
--- a/src/bin/ui/live_view/elementary/live_multibuttonentry.c
+++ b/src/bin/ui/live_view/elementary/live_multibuttonentry.c
@@ -20,12 +20,12 @@
 #include "live_elementary_widgets.h"
 
 static void
-_on_multibutton_swallow_check(void *data,
-                              Evas_Object *obj __UNUSED__,
+_on_multibutton_swallow_check(void *data __UNUSED__,
+                              Evas_Object *obj,
                               void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Elm_Object_Item *multi_item = elm_multibuttonentry_first_item_get(data);
+   Elm_Object_Item *multi_item = elm_multibuttonentry_first_item_get(obj);
    Evas_Object *content;
 
    while (multi_item)
@@ -65,12 +65,12 @@ _on_multibutton_swallow_check(void *data,
 }
 
 static void
-_on_multibutton_text_check(void *data,
-                           Evas_Object *obj __UNUSED__,
+_on_multibutton_text_check(void *data __UNUSED__,
+                           Evas_Object *obj,
                            void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Elm_Object_Item *multi_item = elm_multibuttonentry_first_item_get(data);
+   Elm_Object_Item *multi_item = elm_multibuttonentry_first_item_get(obj);
 
    while (multi_item)
      {
@@ -80,8 +80,8 @@ _on_multibutton_text_check(void *data,
 }
 
 static void
-_multibutton_send_signal(void *data,
-                         Evas_Object *obj __UNUSED__,
+_multibutton_send_signal(void *data __UNUSED__,
+                         Evas_Object *obj,
                          void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
@@ -89,7 +89,7 @@ _multibutton_send_signal(void *data,
 
    assert(data != NULL);
 
-   item = elm_multibuttonentry_first_item_get(data);
+   item = elm_multibuttonentry_first_item_get(obj);
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
@@ -101,17 +101,6 @@ _multibutton_send_signal(void *data,
      }
 }
 
-void
-_demo_multibutton_del(void *data __UNUSED__,
-                      Evas *evas __UNUSED__,
-                      Evas_Object *object,
-                      void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_multibutton_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET,    
_on_multibutton_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_multibutton_send_signal, object);
-}
-
 Evas_Object *
 widget_multibuttonentry_create(Evas_Object *parent, const Group *group)
 {
@@ -138,17 +127,15 @@ widget_multibuttonentry_create(Evas_Object *parent, const 
Group *group)
    /** in case when we edit button gorup, we need to apply changes to items */
    if (strcmp(group->class, "btn") == 0)
      {
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_multibutton_swallow_check, object);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET,    
_on_multibutton_text_check, object);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_multibutton_send_signal, object);
-        evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
_demo_multibutton_del, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_multibutton_swallow_check, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET,    
_on_multibutton_text_check, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_multibutton_send_signal, NULL);
      }
    else /** on all other cases we need to apply changes to whole object */
      {
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
on_text_check, object);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-        evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
demo_object_del, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
on_text_check, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
      }
 
    /** closed button is group used for showing collapsed multibuttonentry only 
*/
diff --git a/src/bin/ui/live_view/elementary/live_naviframe.c 
b/src/bin/ui/live_view/elementary/live_naviframe.c
index ef4d056..7643fea 100644
--- a/src/bin/ui/live_view/elementary/live_naviframe.c
+++ b/src/bin/ui/live_view/elementary/live_naviframe.c
@@ -61,44 +61,43 @@ _prev_page_cb(void *data, Evas_Object *obj __UNUSED__, void 
*event_info __UNUSED
 
 static void
 _on_naviframe_swallow_check(void *data __UNUSED__,
-                            Evas_Object *obj __UNUSED__,
-                            void *ei __UNUSED__)
+                            Evas_Object *obj,
+                            void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *) data;
    Elm_Object_Item *item_main, *item_current;
 
-   item_current = evas_object_data_get(object, "main_page");
-   item_main = elm_naviframe_top_item_get(object);
+   item_current = evas_object_data_get(obj, "main_page");
+   item_main = elm_naviframe_top_item_get(obj);
    if (item_current != item_main)
-     elm_naviframe_item_pop(object);
+     elm_naviframe_item_pop(obj);
 
    if (part->change)
      {
         if (part->object)
           {
-             elm_object_part_content_unset(object, part->name);
+             elm_object_part_content_unset(obj, part->name);
              evas_object_del(part->object);
              part->object = NULL;
           }
 
-        part->object = object_generate(part, object);
+        part->object = object_generate(part, obj);
         evas_object_show(part->object);
         if ((part->swallow_content == CONTENT_WIDGET) && (part->widget == 
WIDGET_BUTTON))
           {
              if (!strcmp(part->name, "elm.swallow.prev_btn"))
                {
                   elm_object_text_set(part->object, _("Prev page"));
-                  evas_object_smart_callback_add(part->object, "clicked", 
_prev_page_cb, object);
+                  evas_object_smart_callback_add(part->object, "clicked", 
_prev_page_cb, obj);
                }
              else if (!strcmp(part->name, "elm.swallow.next_btn"))
                {
                   elm_object_text_set(part->object, _("Next page"));
-                  evas_object_smart_callback_add(part->object, "clicked", 
_next_page_cb, object);
+                  evas_object_smart_callback_add(part->object, "clicked", 
_next_page_cb, obj);
                }
           }
         part->change = false;
-        elm_object_part_content_set(object, part->name, part->object);
+        elm_object_part_content_set(obj, part->name, part->object);
      }
 
    if (part->object)
@@ -120,28 +119,26 @@ _on_naviframe_swallow_check(void *data __UNUSED__,
 
 static void
 _on_naviframe_text_check(void *data __UNUSED__,
-                         Evas_Object *obj __UNUSED__,
-                         void *ei __UNUSED__)
+                         Evas_Object *obj,
+                         void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *) data;
    Elm_Object_Item *item_main, *item_current;
 
-   item_current = evas_object_data_get(object, "main_page");
-   item_main = elm_naviframe_top_item_get(object);
+   item_current = evas_object_data_get(obj, "main_page");
+   item_main = elm_naviframe_top_item_get(obj);
    if (item_current != item_main)
-     elm_naviframe_item_pop(object);
+     elm_naviframe_item_pop(obj);
 
-   elm_object_part_text_set(object, part->name, part->text_content);
+   elm_object_part_text_set(obj, part->name, part->text_content);
 }
 
 static void
-_naviframe_send_signal(void *data,
-                       Evas_Object *obj __UNUSED__,
-                       void *ei __UNUSED__)
+_naviframe_send_signal(void *data __UNUSED__,
+                       Evas_Object *obj,
+                       void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
-   Evas_Object *object = (Evas_Object *)data;
 
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
@@ -149,10 +146,10 @@ _naviframe_send_signal(void *data,
 
    Elm_Object_Item *item_main, *item_current;
 
-   item_current = evas_object_data_get(object, "main_page");
-   item_main = elm_naviframe_top_item_get(object);
+   item_current = evas_object_data_get(obj, "main_page");
+   item_main = elm_naviframe_top_item_get(obj);
    if (item_current != item_main)
-     item_current = elm_naviframe_item_pop(object);
+     item_current = elm_naviframe_item_pop(obj);
 
    elm_object_item_signal_emit(item_current, sig->sig_name, sig->source_name);
 }
@@ -188,9 +185,9 @@ widget_naviframe_create(Evas_Object *parent, const Group 
*group)
    elm_object_item_part_text_set(it, "title", _("Main Page"));
    evas_object_data_set(nf, "main_page", it);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_naviframe_swallow_check, nf);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_naviframe_text_check, nf);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_naviframe_send_signal, nf);
+   evas_object_smart_callback_add(nf, SIGNAL_DEMO_SWALLOW_SET, 
_on_naviframe_swallow_check, NULL);
+   evas_object_smart_callback_add(nf, SIGNAL_DEMO_TEXT_SET, 
_on_naviframe_text_check, NULL);
+   evas_object_smart_callback_add(nf, SIGNAL_DEMO_SIGNAL_SEND, 
_naviframe_send_signal, NULL);
 
    elm_object_style_set(nf, style_name);
 
diff --git a/src/bin/ui/live_view/elementary/live_notify.c 
b/src/bin/ui/live_view/elementary/live_notify.c
index 9ae1a7e..fa50daf 100644
--- a/src/bin/ui/live_view/elementary/live_notify.c
+++ b/src/bin/ui/live_view/elementary/live_notify.c
@@ -22,7 +22,7 @@
 static void
 _on_notify_swallow_check(void *data,
                          Evas_Object *obj __UNUSED__,
-                         void *ei __UNUSED__)
+                         void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Evas_Object *object = (Evas_Object *) data;
@@ -62,18 +62,17 @@ _on_notify_swallow_check(void *data,
 }
 
 static void
-_notify_send_signal(void *data,
-                    Evas_Object *obj __UNUSED__,
+_notify_send_signal(void *data __UNUSED__,
+                    Evas_Object *obj,
                     void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
-   Evas_Object *object = (Evas_Object *)data;
 
    assert(sig != NULL);
    assert(sig->sig_name != NULL);
    assert(sig->source_name != NULL);
 
-   elm_layout_signal_emit(object, sig->sig_name, sig->source_name);
+   elm_layout_signal_emit(obj, sig->sig_name, sig->source_name);
 }
 
 static void
@@ -147,19 +146,6 @@ _on_click(void *data,
    evas_object_show(notify);
 }
 
-void
-_demo_noti_del(void *data,
-               Evas *evas __UNUSED__,
-               Evas_Object *object,
-               void *event_info __UNUSED__)
-{
-   Evas_Object *bx = (Evas_Object *)data;
-
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_notify_swallow_check, bx);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_notify_send_signal, object);
-}
-
 Evas_Object *
 widget_notify_create(Evas_Object *parent, const Group *group)
 {
@@ -188,10 +174,9 @@ widget_notify_create(Evas_Object *parent, const Group 
*group)
    object = elm_box_add(parent);
    elm_box_pack_end(object, btn);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_notify_swallow_check, bx);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
noti);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_notify_send_signal, noti);
-   evas_object_event_callback_add(noti, EVAS_CALLBACK_DEL, _demo_noti_del, bx);
+   evas_object_smart_callback_add(noti, SIGNAL_DEMO_SWALLOW_SET, 
_on_notify_swallow_check, bx);
+   evas_object_smart_callback_add(noti, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(noti, SIGNAL_DEMO_SIGNAL_SEND, 
_notify_send_signal, NULL);
 
    elm_object_style_set(noti, group->style);
    return object;
diff --git a/src/bin/ui/live_view/elementary/live_panel.c 
b/src/bin/ui/live_view/elementary/live_panel.c
index 078aa20..eb93f7b 100644
--- a/src/bin/ui/live_view/elementary/live_panel.c
+++ b/src/bin/ui/live_view/elementary/live_panel.c
@@ -49,10 +49,9 @@ widget_panel_create(Evas_Object *parent, const Group *group)
    Evas_Object *object = elm_panel_add(parent);
    elm_panel_orient_set(object, _panel_orient_get(group->class));
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_panes.c 
b/src/bin/ui/live_view/elementary/live_panes.c
index 30d5e1c..0f95721 100644
--- a/src/bin/ui/live_view/elementary/live_panes.c
+++ b/src/bin/ui/live_view/elementary/live_panes.c
@@ -64,10 +64,9 @@ widget_panes_create(Evas_Object *parent, const Group *group)
    elm_object_part_content_set(object, "right", test_right);
    elm_object_part_content_set(object, "left", test_left);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_popup.c 
b/src/bin/ui/live_view/elementary/live_popup.c
index a4b0c42..390d679 100644
--- a/src/bin/ui/live_view/elementary/live_popup.c
+++ b/src/bin/ui/live_view/elementary/live_popup.c
@@ -20,12 +20,11 @@
 #include "live_elementary_widgets.h"
 
 static void
-_on_popup_swallow_check(void *data,
-                        Evas_Object *obj __UNUSED__,
+_on_popup_swallow_check(void *data __UNUSED__,
+                        Evas_Object *obj,
                         void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
-   Evas_Object *object = (Evas_Object *) data;
    Evas_Object *content;
    char *pointer = NULL;
    Eina_Stringshare *but_swallow = NULL, *title_swallow = NULL;
@@ -47,18 +46,18 @@ _on_popup_swallow_check(void *data,
           {
              if (but_swallow)
                {
-                  content = elm_object_part_content_get(object, but_swallow);
-                  elm_object_part_content_unset(object, but_swallow);
+                  content = elm_object_part_content_get(obj, but_swallow);
+                  elm_object_part_content_unset(obj, but_swallow);
                }
              else if (title_swallow)
                {
-                  content = elm_object_part_content_get(object, part->name);
-                  elm_object_part_content_unset(object, part->name);
+                  content = elm_object_part_content_get(obj, part->name);
+                  elm_object_part_content_unset(obj, part->name);
                }
              else
                {
-                  content = elm_object_content_get(object);
-                  elm_object_content_unset(object);
+                  content = elm_object_content_get(obj);
+                  elm_object_content_unset(obj);
                }
              evas_object_del(content);
              content = NULL;
@@ -67,19 +66,19 @@ _on_popup_swallow_check(void *data,
 
         if (but_swallow)
           {
-             part->object = elm_button_add(object);
+             part->object = elm_button_add(obj);
              elm_object_text_set(part->object, "OK");
-             elm_object_part_content_set(object, but_swallow, part->object);
+             elm_object_part_content_set(obj, but_swallow, part->object);
           }
         else if (title_swallow)
           {
-             part->object = object_generate(part, object);
-             elm_object_part_content_set(object, title_swallow, part->object);
+             part->object = object_generate(part, obj);
+             elm_object_part_content_set(obj, title_swallow, part->object);
           }
         else
           {
-             part->object = object_generate(part, object);
-             elm_object_content_set(object, part->object);
+             part->object = object_generate(part, obj);
+             elm_object_content_set(obj, part->object);
           }
         part->change = false;
      }
@@ -104,17 +103,6 @@ _on_popup_swallow_check(void *data,
    eina_stringshare_del(title_swallow);
 }
 
-void
-_demo_popup_del(void *data __UNUSED__,
-                Evas *evas __UNUSED__,
-                Evas_Object *object,
-                void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_popup_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
on_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-}
-
 Evas_Object *
 widget_popup_create(Evas_Object *parent, const Group *group)
 {
@@ -138,10 +126,9 @@ widget_popup_create(Evas_Object *parent, const Group 
*group)
    free(style_parsed[0]);
    free(style_parsed);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_popup_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, _demo_popup_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_popup_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, style_name);
    eina_stringshare_del(style_name);
diff --git a/src/bin/ui/live_view/elementary/live_progressbar.c 
b/src/bin/ui/live_view/elementary/live_progressbar.c
index 1d5ce3b..e097506 100644
--- a/src/bin/ui/live_view/elementary/live_progressbar.c
+++ b/src/bin/ui/live_view/elementary/live_progressbar.c
@@ -31,10 +31,9 @@ widget_progressbar_create(Evas_Object *parent, const Group 
*group)
    if (!strcmp(group->class, "vertical"))
       elm_progressbar_horizontal_set(object, false);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_scroller.c 
b/src/bin/ui/live_view/elementary/live_scroller.c
index e009b07..d8fd659 100644
--- a/src/bin/ui/live_view/elementary/live_scroller.c
+++ b/src/bin/ui/live_view/elementary/live_scroller.c
@@ -20,17 +20,16 @@
 #include "live_elementary_widgets.h"
 
 static void
-_on_scroller_swallow_check(void *data,
-                           Evas_Object *obj __UNUSED__,
+_on_scroller_swallow_check(void *data __UNUSED__,
+                           Evas_Object *obj,
                            void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Evas_Object *content, *bt;
-   Evas_Object *object = (Evas_Object *)data;
 
    if (!strcmp(part->name, "elm.swallow.content"))
      {
-        content = elm_table_add(object);
+        content = elm_table_add(obj);
         int i, j;
 
         for (j = 0; j < ELEMENTS_MID_COUNT; j++)
@@ -59,13 +58,13 @@ _on_scroller_swallow_check(void *data,
                   evas_object_show(bt);
                }
           }
-        elm_object_content_set(object, content);
+        elm_object_content_set(obj, content);
         part->object = content;
         evas_object_show(content);
      }
    else
      {
-        bt = object_generate(part, object);
+        bt = object_generate(part, obj);
         if (bt)
           {
              evas_object_color_set(part->object,
@@ -81,21 +80,10 @@ _on_scroller_swallow_check(void *data,
                                            part->max_w,
                                            part->max_h);
           }
-        elm_object_part_content_set(object, part->name, part->object);
+        elm_object_part_content_set(obj, part->name, part->object);
      }
 }
 
-void
-_demo_scroller_del(void *data __UNUSED__,
-                   Evas *evas __UNUSED__,
-                   Evas_Object *object,
-                   void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_scroller_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
on_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-}
-
 Evas_Object *
 widget_scroller_create(Evas_Object *parent, const Group *group)
 {
@@ -109,25 +97,23 @@ widget_scroller_create(Evas_Object *parent, const Group 
*group)
    if ((strcmp(group->class, "entry") == 0) || (strcmp(group->class, 
"entry_single") == 0))
      {
         object = elm_entry_add(parent);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
         elm_entry_scrollable_set(object, true);
         if (strcmp(group->class, "entry_single") == 0)
           elm_entry_single_line_set(object, true);
-        evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
demo_object_del, NULL);
      }
    else
      {
         object = elm_scroller_add(parent);
-        evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_scroller_swallow_check, object);
-        evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, 
_demo_scroller_del, NULL);
+        evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_scroller_swallow_check, NULL);
      }
    elm_object_style_set(object, group->style);
 
    elm_scroller_policy_set(object, ELM_SCROLLER_POLICY_ON,
                            ELM_SCROLLER_POLICY_ON);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_segment_control.c 
b/src/bin/ui/live_view/elementary/live_segment_control.c
index dcf8c01..d87b4d4 100644
--- a/src/bin/ui/live_view/elementary/live_segment_control.c
+++ b/src/bin/ui/live_view/elementary/live_segment_control.c
@@ -21,26 +21,24 @@
 
 static void
 _on_sc_swallow_check(void *data __UNUSED__,
-                     Evas_Object *obj __UNUSED__,
-                     void *ei __UNUSED__)
+                     Evas_Object *obj,
+                     void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Elm_Object_Item *item;
    int i;
 
-   Evas_Object *object = (Evas_Object *) data;
-
    for (i = 0; i < 3; i++)
      {
         TODO("Three items at the same time (store it somehow and free later)")
-        item = elm_segment_control_item_get(object, i);
+        item = elm_segment_control_item_get(obj, i);
         if (part->object)
           {
              evas_object_del(part->object);
              part->object = NULL;
           }
 
-        part->object = object_generate(part, object);
+        part->object = object_generate(part, obj);
         part->change = false;
         elm_object_item_part_content_set(item, part->name, part->object);
 
@@ -63,26 +61,24 @@ _on_sc_swallow_check(void *data __UNUSED__,
 }
 
 static void
-_on_sc_text_check(void *data,
-                  Evas_Object *obj __UNUSED__,
-                  void *ei __UNUSED__)
+_on_sc_text_check(void *data __UNUSED__,
+                  Evas_Object *obj,
+                  void *ei)
 {
    Demo_Part *part = (Demo_Part *)ei;
    Elm_Object_Item *item;
    int i;
 
-   Evas_Object *object = (Evas_Object *) data;
-
    for (i = 0; i < 3; i++)
      {
-        item = elm_segment_control_item_get(object, i);
+        item = elm_segment_control_item_get(obj, i);
         elm_object_item_part_text_set(item, part->name, part->text_content);
      }
 }
 
 static void
-_sc_send_signal(void *data,
-                Evas_Object *obj __UNUSED__,
+_sc_send_signal(void *data __UNUSED__,
+                Evas_Object *obj,
                 void *ei)
 {
    Demo_Signal *sig = (Demo_Signal *)ei;
@@ -98,22 +94,11 @@ _sc_send_signal(void *data,
 
    for (i = 0; i < 3; i++)
      {
-        item = elm_segment_control_item_get(data, i);
+        item = elm_segment_control_item_get(obj, i);
         elm_object_item_signal_emit(item, sig->sig_name, sig->source_name);
      }
 }
 
-void
-_demo_sc_del(void *data __UNUSED__,
-             Evas *evas __UNUSED__,
-             Evas_Object *object,
-             void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_sc_swallow_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_sc_text_check, object);
-   evas_object_smart_callback_del_full(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_sc_send_signal, object);
-}
-
 Evas_Object *
 widget_segment_control_create(Evas_Object *parent, const Group *group)
 {
@@ -126,10 +111,9 @@ widget_segment_control_create(Evas_Object *parent, const 
Group *group)
    elm_segment_control_item_insert_at(object, NULL, NULL, 2);
    elm_segment_control_item_insert_at(object, NULL, NULL, 3);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
_on_sc_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, 
_on_sc_text_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
_sc_send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, _demo_sc_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
_on_sc_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, 
_on_sc_text_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
_sc_send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_separator.c 
b/src/bin/ui/live_view/elementary/live_separator.c
index b5d4c26..15205ab 100644
--- a/src/bin/ui/live_view/elementary/live_separator.c
+++ b/src/bin/ui/live_view/elementary/live_separator.c
@@ -54,10 +54,9 @@ widget_separator_create(Evas_Object *parent, const Group 
*group)
 
 #undef _ADD_RECT
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_slider.c 
b/src/bin/ui/live_view/elementary/live_slider.c
index 249c22c..3b5a533 100644
--- a/src/bin/ui/live_view/elementary/live_slider.c
+++ b/src/bin/ui/live_view/elementary/live_slider.c
@@ -49,10 +49,9 @@ widget_slider_create(Evas_Object *parent, const Group *group)
    elm_slider_indicator_format_set(object, "%1.2f");
    elm_slider_min_max_set(object, 0, 10);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, style_name);
 
diff --git a/src/bin/ui/live_view/elementary/live_spinner.c 
b/src/bin/ui/live_view/elementary/live_spinner.c
index 9144d2d..dd5d7d5 100644
--- a/src/bin/ui/live_view/elementary/live_spinner.c
+++ b/src/bin/ui/live_view/elementary/live_spinner.c
@@ -33,10 +33,9 @@ widget_spinner_create(Evas_Object *parent, const Group 
*group)
    elm_spinner_min_max_set(object, -50.0, 250.0);
    elm_spinner_editable_set(object, true);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    elm_object_style_set(object, group->style);
 
diff --git a/src/bin/ui/live_view/elementary/live_toolbar.c 
b/src/bin/ui/live_view/elementary/live_toolbar.c
index 25abc5c..ca0c30e 100644
--- a/src/bin/ui/live_view/elementary/live_toolbar.c
+++ b/src/bin/ui/live_view/elementary/live_toolbar.c
@@ -80,10 +80,9 @@ widget_toolbar_create(Evas_Object *parent, const Group 
*group)
    object = _create_toolbar(parent, group->class, group->style);
    evas_object_show(object);
 
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, 
object);
-   evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, object);
-   evas_object_event_callback_add(object, EVAS_CALLBACK_DEL, demo_object_del, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, 
NULL);
+   evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
 
    return object;
 }
diff --git a/src/bin/ui/live_view/elementary/live_widget_common.c 
b/src/bin/ui/live_view/elementary/live_widget_common.c
index 5b16744..83a3c28 100644
--- a/src/bin/ui/live_view/elementary/live_widget_common.c
+++ b/src/bin/ui/live_view/elementary/live_widget_common.c
@@ -382,17 +382,6 @@ object_generate(Demo_Part *part, Evas_Object *object)
 }
 
 void
-demo_object_del(void *data __UNUSED__,
-                Evas *evas __UNUSED__,
-                Evas_Object *object,
-                void *event_info __UNUSED__)
-{
-   evas_object_smart_callback_del_full(object, SIGNAL_DEMO_SWALLOW_SET, 
on_swallow_check, NULL);
-   evas_object_smart_callback_del_full(object, SIGNAL_DEMO_TEXT_SET, 
on_text_check, NULL);
-   evas_object_smart_callback_del_full(object, SIGNAL_DEMO_SIGNAL_SEND, 
send_signal, NULL);
-}
-
-void
 on_swallow_check(void *data __UNUSED__,
                  Evas_Object *obj,
                  void *ei)

-- 


Reply via email to