summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_box.c2
-rw-r--r--src/bin/elementary/test_calendar.c2
-rw-r--r--src/bin/elementary/test_efl_gfx_map.c2
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/bin/elementary/test_glview.c2
-rw-r--r--src/bin/elementary/test_nstate.c2
-rw-r--r--src/bin/elementary/test_part_bg.c2
-rw-r--r--src/bin/elementary/test_part_shadow.c4
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c16
-rw-r--r--src/bin/elementary/test_ui_progressbar.c4
-rw-r--r--src/bin/elementary/test_ui_scroller.c2
-rw-r--r--src/bin/elementary/test_ui_slider.c2
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c2
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/bin/elementary/test_ui_table_static.c2
-rw-r--r--src/bin/elementary/test_win_dialog.c2
-rw-r--r--src/bin/elementary/test_win_indicator.c4
-rw-r--r--src/bin/elementary/test_win_stack.c4
-rw-r--r--src/examples/ecore/ecore_audio_custom.c4
-rw-r--r--src/examples/ecore/ecore_audio_playback.c8
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c18
-rw-r--r--src/examples/ecore/ecore_idler_example.c2
-rw-r--r--src/examples/ecore/ecore_poller_example.c12
-rw-r--r--src/examples/ecore/efl_io_copier_example.c12
-rw-r--r--src/examples/ecore/efl_io_queue_example.c8
-rw-r--r--src/examples/ecore/efl_net_server_example.c6
-rw-r--r--src/examples/ecore/efl_net_server_simple_example.c2
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_dialer_example.c6
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c6
-rw-r--r--src/examples/eio/eio_sentry.c2
-rw-r--r--src/examples/elementary/efl_ui_scroller_example.c4
-rw-r--r--src/examples/elementary/efl_ui_view_list_example_1.c2
-rw-r--r--src/examples/elementary/efl_ui_view_list_example_2.c2
-rw-r--r--src/examples/elementary/efl_ui_view_list_example_3.c2
-rw-r--r--src/examples/elementary/filemvc.c9
-rw-r--r--src/examples/elementary/fileviewlist.c4
-rw-r--r--src/examples/elementary/layout_model_connect.c4
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c6
-rw-r--r--src/lib/ecore_con/efl_net_ssl_context.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c12
-rw-r--r--src/lib/edje/edje_main.c10
-rw-r--r--src/lib/edje/edje_multisense.c24
-rw-r--r--src/lib/elementary/efl_ui_view_list.c2
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c4
-rw-r--r--src/lib/elementary/elm_sys_notify.c2
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c61
-rw-r--r--src/tests/ecore/efl_app_test_promise.c4
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c46
-rw-r--r--src/tests/efl/efl_test_model_composite.c8
-rw-r--r--src/tests/efl/efl_test_model_container.c2
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.c2
-rw-r--r--src/tests/eio/eio_test_sentry.c40
-rw-r--r--src/tests/elementary/elm_test_atspi.c28
-rw-r--r--src/tests/elementary/elm_test_config.c4
-rw-r--r--src/tests/elementary/elm_test_focus.c128
-rw-r--r--src/tests/elementary/elm_test_focus_common.c4
-rw-r--r--src/tests/elementary/elm_test_focus_sub.c38
67 files changed, 308 insertions, 312 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index be0f553..59d1882 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -330,7 +330,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
330 Evas_Object *win, *box, *cs; 330 Evas_Object *win, *box, *cs;
331 char buf[PATH_MAX]; 331 char buf[PATH_MAX];
332 332
333 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 333 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
334 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"), 334 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"),
335 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 335 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
336 efl_ui_win_alpha_set(efl_added, 1)); 336 efl_ui_win_alpha_set(efl_added, 1));
@@ -403,7 +403,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
403 Evas_Object *rd, *rdg; 403 Evas_Object *rd, *rdg;
404 char buf[PATH_MAX]; 404 char buf[PATH_MAX];
405 405
406 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 406 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
407 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"), 407 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"),
408 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 408 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
409 efl_ui_win_alpha_set(efl_added, EINA_FALSE)); 409 efl_ui_win_alpha_set(efl_added, EINA_FALSE));
diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c
index ef195b6..f50dcb3 100644
--- a/src/bin/elementary/test_box.c
+++ b/src/bin/elementary/test_box.c
@@ -889,7 +889,7 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
889 Evas_Object *win, *bx, *o; 889 Evas_Object *win, *bx, *o;
890 char buf[PATH_MAX]; 890 char buf[PATH_MAX];
891 891
892 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 892 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
893 efl_text_set(efl_added, "Efl.Ui.Box_Stack"), 893 efl_text_set(efl_added, "Efl.Ui.Box_Stack"),
894 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 894 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
895 895
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index aeb31f9..ba37407 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -431,7 +431,7 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
431 current_date = time(NULL) + SEC_PER_YEAR; 431 current_date = time(NULL) + SEC_PER_YEAR;
432 localtime_r(&current_date, &max_date); 432 localtime_r(&current_date, &max_date);
433 433
434 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 434 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
435 efl_text_set(efl_added, "Efl Ui Calendar"), 435 efl_text_set(efl_added, "Efl Ui Calendar"),
436 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 436 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
437 437
diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_map.c
index 3c6e301..72d7db1 100644
--- a/src/bin/elementary/test_efl_gfx_map.c
+++ b/src/bin/elementary/test_efl_gfx_map.c
@@ -45,7 +45,7 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
45 Evas_Object *win, *img; 45 Evas_Object *win, *img;
46 char buf[PATH_MAX]; 46 char buf[PATH_MAX];
47 47
48 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 48 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
49 efl_text_set(efl_added, "Efl Gfx Map"), 49 efl_text_set(efl_added, "Efl Gfx Map"),
50 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 50 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
51 51
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 3dc6411..7e25aaf 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -53,7 +53,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
53 Evas_Object *win, *img; 53 Evas_Object *win, *img;
54 char buf[PATH_MAX]; 54 char buf[PATH_MAX];
55 55
56 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 56 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
57 efl_text_set(efl_added, "Evas Map"), 57 efl_text_set(efl_added, "Evas Map"),
58 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 58 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
59 59
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 6a4bbcf..e322f7b 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -108,7 +108,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
108 Elm_Genlist_Item_Class *itc; 108 Elm_Genlist_Item_Class *itc;
109 char buf[PATH_MAX]; 109 char buf[PATH_MAX];
110 110
111 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 111 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
112 efl_text_set(efl_added, "Evas masking demo"), 112 efl_text_set(efl_added, "Evas masking demo"),
113 efl_ui_win_autodel_set(efl_added, 1)); 113 efl_ui_win_autodel_set(efl_added, 1));
114 114
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 411da14..e288278 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -118,7 +118,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
118 Eo *win, *table, *o, *snap, *box; 118 Eo *win, *table, *o, *snap, *box;
119 const char *path; 119 const char *path;
120 120
121 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 121 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
122 efl_text_set(efl_added, "Evas Snapshot"), 122 efl_text_set(efl_added, "Evas Snapshot"),
123 efl_ui_win_autodel_set(efl_added, 1)); 123 efl_ui_win_autodel_set(efl_added, 1));
124 124
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index da68bb6..72b0ba3 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -333,7 +333,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
333{ 333{
334 Eo *win, *box, *box2, *o, *text = NULL, *spinner, *code, *split, *flip, *tb; 334 Eo *win, *box, *box2, *o, *text = NULL, *spinner, *code, *split, *flip, *tb;
335 335
336 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 336 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
337 efl_text_set(efl_added, "Gfx Filter Editor"), 337 efl_text_set(efl_added, "Gfx Filter Editor"),
338 efl_ui_win_autodel_set(efl_added, 1)); 338 efl_ui_win_autodel_set(efl_added, 1));
339 339
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 2a69dae..6a133e9 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -644,7 +644,7 @@ _test_glview_do(Evas_GL_Context_Version version)
644 elm_config_accel_preference_set(accel); 644 elm_config_accel_preference_set(accel);
645 eina_stringshare_del(accel); 645 eina_stringshare_del(accel);
646#else 646#else
647 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 647 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
648 efl_ui_win_name_set(efl_added, "glview"), 648 efl_ui_win_name_set(efl_added, "glview"),
649 efl_text_set(efl_added, "GLView"), 649 efl_text_set(efl_added, "GLView"),
650 efl_ui_win_accel_preference_set(efl_added, "gl:depth")); 650 efl_ui_win_accel_preference_set(efl_added, "gl:depth"));
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 54924e7..4da3b21 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -15,7 +15,7 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
15{ 15{
16 Evas_Object *win, *bx, *nstate; 16 Evas_Object *win, *bx, *nstate;
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 18 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
19 efl_text_set(efl_added, "N-state widget"), 19 efl_text_set(efl_added, "N-state widget"),
20 elm_win_autodel_set(efl_added, EINA_TRUE)); 20 elm_win_autodel_set(efl_added, EINA_TRUE));
21 21
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index ac4b294..111af88 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -142,7 +142,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
142 content_class[16] = EFL_UI_SPIN_CLASS; 142 content_class[16] = EFL_UI_SPIN_CLASS;
143 content_class[17] = EFL_UI_SPIN_BUTTON_CLASS; 143 content_class[17] = EFL_UI_SPIN_BUTTON_CLASS;
144 144
145 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 145 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
146 efl_text_set(efl_added, "Widget Part Background"), 146 efl_text_set(efl_added, "Widget Part Background"),
147 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 147 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
148 148
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index 4db24ec..2df5f67 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -71,7 +71,7 @@ _delete_cb(void *data, const Efl_Event *ev)
71 Test_Data *td = data; 71 Test_Data *td = data;
72 72
73 pulse_stop(td, NULL); 73 pulse_stop(td, NULL);
74 efl_del(ev->object); 74 efl_unref(ev->object);
75 free(td); 75 free(td);
76} 76}
77 77
@@ -85,7 +85,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
85 85
86 td = calloc(1, sizeof(*td)); 86 td = calloc(1, sizeof(*td));
87 87
88 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 88 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
89 efl_ui_win_name_set(efl_added, "shadow"), 89 efl_ui_win_name_set(efl_added, "shadow"),
90 efl_text_set(efl_added, "Shadow effects")); 90 efl_text_set(efl_added, "Shadow effects"));
91 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _delete_cb, td); 91 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _delete_cb, td);
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index f89d64b..f6c2e97 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -804,7 +804,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
804 Eo *win, *bx, *zoomable, *rect; 804 Eo *win, *bx, *zoomable, *rect;
805 char buf[PATH_MAX]; 805 char buf[PATH_MAX];
806 806
807 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 807 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
808 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 808 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"), 809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
810 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 810 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 6519dad..f5aa340 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -27,7 +27,7 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
27 Eo *win, *bx, *btn; 27 Eo *win, *bx, *btn;
28 char buf[PATH_MAX]; 28 char buf[PATH_MAX];
29 29
30 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
32 efl_text_set(efl_added, "Efl.Ui.Button"), 32 efl_text_set(efl_added, "Efl.Ui.Button"),
33 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 33 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index 4a60345..2e667b5 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -47,7 +47,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
47{ 47{
48 Evas_Object *win, *bx; 48 Evas_Object *win, *bx;
49 49
50 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 50 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
51 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 51 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
52 efl_text_set(efl_added, "Efl.Ui.Clock"), 52 efl_text_set(efl_added, "Efl.Ui.Clock"),
53 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 53 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 89692aa..4e6d337 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -8,7 +8,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
8{ 8{
9 Eo *win, *panes, *panes_h; 9 Eo *win, *panes, *panes_h;
10 10
11 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 11 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
12 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 12 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
13 efl_text_set(efl_added, "Efl.Ui.Panes"), 13 efl_text_set(efl_added, "Efl.Ui.Panes"),
14 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 14 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index 4667924..3c8ae67 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -213,7 +213,7 @@ static void
213_win_del(void *data, const Efl_Event *ev EINA_UNUSED) 213_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
214{ 214{
215 efl_ui_popup_data *p_data = data; 215 efl_ui_popup_data *p_data = data;
216 efl_del(p_data->panel_win); 216 efl_unref(p_data->panel_win);
217 free(p_data); 217 free(p_data);
218 printf("window is deleted\n"); 218 printf("window is deleted\n");
219} 219}
@@ -222,7 +222,7 @@ static void
222_panel_win_del(void *data, const Efl_Event *ev EINA_UNUSED) 222_panel_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
223{ 223{
224 efl_ui_popup_data *p_data = data; 224 efl_ui_popup_data *p_data = data;
225 efl_del(p_data->win); 225 efl_unref(p_data->win);
226 free(p_data); 226 free(p_data);
227 printf("window is deleted\n"); 227 printf("window is deleted\n");
228} 228}
@@ -232,14 +232,14 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
232{ 232{
233 efl_ui_popup_data *p_data = (efl_ui_popup_data*)calloc(1, sizeof(efl_ui_popup_data)); 233 efl_ui_popup_data *p_data = (efl_ui_popup_data*)calloc(1, sizeof(efl_ui_popup_data));
234 234
235 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 235 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
236 efl_text_set(efl_added, "Efl.Ui.Popup"), 236 efl_text_set(efl_added, "Efl.Ui.Popup"),
237 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 237 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
238 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 238 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
239 239
240 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500)); 240 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
241 241
242 Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 242 Eo *panel_win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
243 efl_text_set(efl_added, "Efl.Ui.Popup Panel"), 243 efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
244 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 244 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
245 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data); 245 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
@@ -351,7 +351,7 @@ test_ui_popup_alert(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
351{ 351{
352 char buf[PATH_MAX]; 352 char buf[PATH_MAX];
353 353
354 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 354 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
355 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"), 355 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
356 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 356 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
357 357
@@ -506,7 +506,7 @@ _alert_scroll_case5_cb(void *data, const Efl_Event *ev EINA_UNUSED)
506void 506void
507test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 507test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
508{ 508{
509 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 509 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
510 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"), 510 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
511 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 511 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
512 512
@@ -889,7 +889,7 @@ _alert_text_case14_cb(void *data, const Efl_Event *ev EINA_UNUSED)
889void 889void
890test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 890test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
891{ 891{
892 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 892 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
893 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"), 893 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
894 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 894 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
895 895
@@ -999,7 +999,7 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
999 999
1000 char buf[PATH_MAX]; 1000 char buf[PATH_MAX];
1001 1001
1002 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 1002 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
1003 efl_text_set(efl_added, "Efl.Ui.Popup.Anchor"), 1003 efl_text_set(efl_added, "Efl.Ui.Popup.Anchor"),
1004 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 1004 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
1005 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 1005 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index ac00c72..09a0e70 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -104,7 +104,7 @@ _win_delete_req_cb(void *d, const Efl_Event *ev EINA_UNUSED)
104 pbdata *pd = d; 104 pbdata *pd = d;
105 105
106 if (pd->timer) ecore_timer_del(pd->timer); 106 if (pd->timer) ecore_timer_del(pd->timer);
107 efl_del(pd->win); 107 efl_unref(pd->win);
108 free(pd); 108 free(pd);
109} 109}
110 110
@@ -117,7 +117,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
117 117
118 pd = (pbdata *)calloc(1, sizeof(pbdata)); 118 pd = (pbdata *)calloc(1, sizeof(pbdata));
119 119
120 pd->win = win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 120 pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
121 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 121 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
122 efl_text_set(efl_added, "Efl.Ui.Progressbar"), 122 efl_text_set(efl_added, "Efl.Ui.Progressbar"),
123 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 123 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index 5d9a689..3edc686 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -28,7 +28,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
28 Eo *win, *sc, *sc2, *sc3, *bx, *bx2, *gd, *gd2; 28 Eo *win, *sc, *sc2, *sc3, *bx, *bx2, *gd, *gd2;
29 int i, j; 29 int i, j;
30 30
31 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 31 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
33 efl_text_set(efl_added, "Efl Ui Scroller"), 33 efl_text_set(efl_added, "Efl Ui Scroller"),
34 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 34 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 966cc6e..9f54a9d 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -32,7 +32,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
32 Eo *win, *bx, *hbx; 32 Eo *win, *bx, *hbx;
33 double step; 33 double step;
34 34
35 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
37 efl_text_set(efl_added, "Efl.Ui.Slider"), 37 efl_text_set(efl_added, "Efl.Ui.Slider"),
38 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 38 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index bad8fca..3973b3d 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -32,7 +32,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
32 Eo *win, *bx, *hbx; 32 Eo *win, *bx, *hbx;
33 double step; 33 double step;
34 34
35 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"), 37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
38 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 38 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index c857cd0..85945a3 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -36,7 +36,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
36{ 36{
37 Eo *win, *bx, *sp; 37 Eo *win, *bx, *sp;
38 38
39 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 39 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
40 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 40 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
41 efl_text_set(efl_added, "Efl.Ui.Spin"), 41 efl_text_set(efl_added, "Efl.Ui.Spin"),
42 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 42 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 0a91da7..095c2a5 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -27,7 +27,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
27 for (i = 0; i < NUM_OF_VALS; i++) 27 for (i = 0; i < NUM_OF_VALS; i++)
28 eina_array_push(array, &values[i]); 28 eina_array_push(array, &values[i]);
29 29
30 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"), 32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
33 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 33 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index 95de97e..369236f 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -104,7 +104,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
104 Eo *win, *table, *bt, *rc, *en; 104 Eo *win, *table, *bt, *rc, *en;
105 api_data *api = calloc(1, sizeof(*api)); 105 api_data *api = calloc(1, sizeof(*api));
106 106
107 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 107 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
108 efl_ui_win_name_set(efl_added, "table"), 108 efl_ui_win_name_set(efl_added, "table"),
109 efl_text_set(efl_added, "Table"), 109 efl_text_set(efl_added, "Table"),
110 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 110 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 5e380ae..6858cf8 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -101,7 +101,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
101{ 101{
102 Efl_Canvas_Object *dia, *lb; 102 Efl_Canvas_Object *dia, *lb;
103 103
104 dia = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 104 dia = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
105 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC), 105 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC),
106 efl_ui_win_name_set(efl_added, "window-dia-4"), 106 efl_ui_win_name_set(efl_added, "window-dia-4"),
107 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 107 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index ecc73de..99f54c5 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -14,7 +14,7 @@ _create_indicator(void)
14{ 14{
15 const char *indi_name; 15 const char *indi_name;
16 16
17 Eo *win = efl_add(EFL_UI_WIN_SOCKET_CLASS, efl_main_loop_get(), 17 Eo *win = efl_add_ref(EFL_UI_WIN_SOCKET_CLASS, NULL,
18 efl_text_set(efl_added, "indicator"), 18 efl_text_set(efl_added, "indicator"),
19 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 19 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
20 efl_ui_win_alpha_set(efl_added, EINA_TRUE)); 20 efl_ui_win_alpha_set(efl_added, EINA_TRUE));
@@ -91,7 +91,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
91 indicator = _create_indicator(); 91 indicator = _create_indicator();
92 92
93 // FIXME: Resizing window should no cause sizing issues! 93 // FIXME: Resizing window should no cause sizing issues!
94 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 94 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
95 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 95 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
96 efl_text_set(efl_added, "Efl.Win.Indicator"), 96 efl_text_set(efl_added, "Efl.Win.Indicator"),
97 efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)), 97 efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)),
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index de16e7b..d13072d 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -18,13 +18,13 @@ _win_new(Evas_Object *stack_top, const char *title)
18 Evas_Object *bg, *bx, *bt, *lb, *win; 18 Evas_Object *bg, *bx, *bt, *lb, *win;
19 19
20 if (level >= 3) 20 if (level >= 3)
21 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 21 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
22 efl_ui_win_name_set(efl_added, "window-stack"), 22 efl_ui_win_name_set(efl_added, "window-stack"),
23 efl_ui_win_type_set(efl_added, ELM_WIN_NAVIFRAME_BASIC), 23 efl_ui_win_type_set(efl_added, ELM_WIN_NAVIFRAME_BASIC),
24 efl_text_set(efl_added, title), 24 efl_text_set(efl_added, title),
25 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 25 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
26 else 26 else
27 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 27 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
28 efl_ui_win_name_set(efl_added, "window-stack"), 28 efl_ui_win_name_set(efl_added, "window-stack"),
29 efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC), 29 efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC),
30 efl_text_set(efl_added, title), 30 efl_text_set(efl_added, title),
diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index abd174b..b0d26a1 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -56,9 +56,9 @@ main(int argc, const char *argv[])
56 56
57 ecore_app_args_set(argc, argv); 57 ecore_app_args_set(argc, argv);
58 58
59 out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, efl_main_loop_get()); 59 out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
60 60
61 in = efl_add(ECORE_AUDIO_OBJ_IN_CLASS, efl_main_loop_get()); 61 in = efl_add_ref(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
62 if (!in) 62 if (!in)
63 { 63 {
64 printf("error when creating ecore audio source.\n"); 64 printf("error when creating ecore audio source.\n");
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 1c32273..c659f09 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -201,7 +201,7 @@ static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event)
201 201
202 inputs = eina_list_remove(inputs, event->object); 202 inputs = eina_list_remove(inputs, event->object);
203 ret = ecore_audio_obj_out_input_detach(out, event->object); 203 ret = ecore_audio_obj_out_input_detach(out, event->object);
204 efl_del(event->object); 204 efl_unref(event->object);
205 205
206 if (!ret) 206 if (!ret)
207 printf("Could not detach input %s\n", name); 207 printf("Could not detach input %s\n", name);
@@ -252,7 +252,7 @@ main(int argc, const char *argv[])
252 { 252 {
253 if (!strncmp(argv[i], "tone:", 5)) 253 if (!strncmp(argv[i], "tone:", 5))
254 { 254 {
255 in = efl_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, efl_main_loop_get()); 255 in = efl_add_ref(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
256 if (!in) 256 if (!in)
257 { 257 {
258 printf("error when creating ecore audio source.\n"); 258 printf("error when creating ecore audio source.\n");
@@ -276,7 +276,7 @@ main(int argc, const char *argv[])
276 } 276 }
277 else 277 else
278 { 278 {
279 in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, efl_main_loop_get()); 279 in = efl_add_ref(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
280 if (!in) 280 if (!in)
281 { 281 {
282 printf("error when creating ecore audio source.\n"); 282 printf("error when creating ecore audio source.\n");
@@ -307,7 +307,7 @@ main(int argc, const char *argv[])
307 307
308 printf("Start: %s (%0.2fs)\n", name, length); 308 printf("Start: %s (%0.2fs)\n", name, length);
309 309
310 out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, efl_main_loop_get()); 310 out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
311 ret = ecore_audio_obj_out_input_attach(out, in); 311 ret = ecore_audio_obj_out_input_attach(out, in);
312 if (!ret) 312 if (!ret)
313 printf("Could not attach input %s\n", name); 313 printf("Could not attach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 63c7f66..756e69a 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -24,8 +24,8 @@ static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event)
24 printf("Done: %s\n", name); 24 printf("Done: %s\n", name);
25 25
26 ecore_audio_obj_in_output_get(event->object, &out); 26 ecore_audio_obj_in_output_get(event->object, &out);
27 efl_del(event->object); 27 efl_unref(event->object);
28 efl_del(out); 28 efl_unref(out);
29 29
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
31 31
@@ -49,31 +49,31 @@ main(int argc, char *argv[])
49 ecore_audio_init(); 49 ecore_audio_init();
50 50
51 51
52 in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, efl_main_loop_get()); 52 in = efl_add_ref(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
53 efl_name_set(in, basename(argv[1])); 53 efl_name_set(in, basename(argv[1]));
54 ret = ecore_audio_obj_source_set(in, argv[1]); 54 ret = ecore_audio_obj_source_set(in, argv[1]);
55 if (!ret) { 55 if (!ret) {
56 printf("Could not set %s as input\n", argv[1]); 56 printf("Could not set %s as input\n", argv[1]);
57 efl_del(in); 57 efl_unref(in);
58 return 1; 58 return 1;
59 } 59 }
60 60
61 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); 61 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
62 62
63 out = efl_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, efl_main_loop_get()); 63 out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
64 ret = ecore_audio_obj_source_set(out, argv[2]); 64 ret = ecore_audio_obj_source_set(out, argv[2]);
65 if (!ret) { 65 if (!ret) {
66 printf("Could not set %s as output\n", argv[2]); 66 printf("Could not set %s as output\n", argv[2]);
67 efl_del(in); 67 efl_unref(in);
68 efl_del(out); 68 efl_unref(out);
69 return 1; 69 return 1;
70 } 70 }
71 71
72 ret = ecore_audio_obj_out_input_attach(out, in); 72 ret = ecore_audio_obj_out_input_attach(out, in);
73 if (!ret) { 73 if (!ret) {
74 printf("Could not attach input\n"); 74 printf("Could not attach input\n");
75 efl_del(out); 75 efl_unref(out);
76 efl_del(in); 76 efl_unref(in);
77 return 1; 77 return 1;
78 } 78 }
79 79
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index a88a002..2185210 100644
--- a/src/examples/ecore/ecore_idler_example.c
+++ b/src/examples/ecore/ecore_idler_example.c
@@ -110,7 +110,7 @@ main(void)
110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); 110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); 111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); 112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
113// ctxt.idler = efl_add(ECORE_IDLER_CLASS, efl_main_loop_get(), ecore_idler_constructor(efl_added, _idler_cb, &ctxt)); 113// ctxt.idler = efl_add_ref(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_added, _idler_cb, &ctxt));
114 ctxt.handler = ecore_event_handler_add(_event_type, 114 ctxt.handler = ecore_event_handler_add(_event_type,
115 _event_handler_cb, 115 _event_handler_cb,
116 &ctxt); 116 &ctxt);
diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c
index 928b937..3cbbcc5 100644
--- a/src/examples/ecore/ecore_poller_example.c
+++ b/src/examples/ecore/ecore_poller_example.c
@@ -48,9 +48,9 @@ main(void)
48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); 48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); 49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
50 50
51// poller1 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); 51// poller1 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
52// poller2 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); 52// poller2 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
53// poller3 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); 53// poller3 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
54 54
55 55
56 ecore_main_loop_begin(); 56 ecore_main_loop_begin();
@@ -61,9 +61,9 @@ main(void)
61// ecore_poller_interval_set(poller2, 16, NULL); 61// ecore_poller_interval_set(poller2, 16, NULL);
62 ecore_main_loop_begin(); 62 ecore_main_loop_begin();
63 63
64// efl_del(poller1); 64// efl_unref(poller1);
65// efl_del(poller2); 65// efl_unref(poller2);
66// efl_del(poller3); 66// efl_unref(poller3);
67 ecore_poller_del(poller1); 67 ecore_poller_del(poller1);
68 ecore_poller_del(poller2); 68 ecore_poller_del(poller2);
69 ecore_poller_del(poller3); 69 ecore_poller_del(poller3);
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index a07b791..b7e526b 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -452,7 +452,7 @@ efl_main(void *data EINA_UNUSED,
452 452
453 if (strcmp(input_fname, ":stdin:") == 0) 453 if (strcmp(input_fname, ":stdin:") == 0)
454 { 454 {
455 input = efl_add(EFL_IO_STDIN_CLASS, ev->object, 455 input = efl_add_ref(EFL_IO_STDIN_CLASS, NULL,
456 efl_event_callback_array_add(efl_added, input_cbs(), NULL)); 456 efl_event_callback_array_add(efl_added, input_cbs(), NULL));
457 if (!input) 457 if (!input)
458 { 458 {
@@ -662,7 +662,7 @@ efl_main(void *data EINA_UNUSED,
662 else 662 else
663 { 663 {
664 /* regular file, open with flags: read-only and close-on-exec */ 664 /* regular file, open with flags: read-only and close-on-exec */
665 input = efl_add(EFL_IO_FILE_CLASS, ev->object, 665 input = efl_add_ref(EFL_IO_FILE_CLASS, NULL,
666 efl_file_set(efl_added, input_fname, NULL), /* mandatory */ 666 efl_file_set(efl_added, input_fname, NULL), /* mandatory */
667 efl_io_file_flags_set(efl_added, O_RDONLY), /* default */ 667 efl_io_file_flags_set(efl_added, O_RDONLY), /* default */
668 efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */ 668 efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */
@@ -679,7 +679,7 @@ efl_main(void *data EINA_UNUSED,
679 679
680 if (strcmp(output_fname, ":stdout:") == 0) 680 if (strcmp(output_fname, ":stdout:") == 0)
681 { 681 {
682 output = efl_add(EFL_IO_STDOUT_CLASS, ev->object, 682 output = efl_add_ref(EFL_IO_STDOUT_CLASS, NULL,
683 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */ 683 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
684 ); 684 );
685 if (!output) 685 if (!output)
@@ -691,7 +691,7 @@ efl_main(void *data EINA_UNUSED,
691 } 691 }
692 else if (strcmp(output_fname, ":stderr:") == 0) 692 else if (strcmp(output_fname, ":stderr:") == 0)
693 { 693 {
694 output = efl_add(EFL_IO_STDERR_CLASS, ev->object, 694 output = efl_add_ref(EFL_IO_STDERR_CLASS, NULL,
695 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */ 695 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
696 ); 696 );
697 if (!output) 697 if (!output)
@@ -718,7 +718,7 @@ efl_main(void *data EINA_UNUSED,
718 * When finished get the efl_io_buffer_slice_get(), see 718 * When finished get the efl_io_buffer_slice_get(), see
719 * _copier_done(). 719 * _copier_done().
720 */ 720 */
721 output = efl_add(EFL_IO_BUFFER_CLASS, ev->object, 721 output = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL,
722 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 722 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
723 efl_event_callback_array_add(efl_added, output_buffer_cbs(), NULL) /* optional */ 723 efl_event_callback_array_add(efl_added, output_buffer_cbs(), NULL) /* optional */
724 ); 724 );
@@ -938,7 +938,7 @@ efl_main(void *data EINA_UNUSED,
938 /* regular file, open with flags: write-only, close-on-exec, 938 /* regular file, open with flags: write-only, close-on-exec,
939 * create if did not exist and truncate if exist. 939 * create if did not exist and truncate if exist.
940 */ 940 */
941 output = efl_add(EFL_IO_FILE_CLASS, ev->object, 941 output = efl_add_ref(EFL_IO_FILE_CLASS, NULL,
942 efl_file_set(efl_added, output_fname, NULL), /* mandatory */ 942 efl_file_set(efl_added, output_fname, NULL), /* mandatory */
943 efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT | O_TRUNC), /* mandatory for write */ 943 efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT | O_TRUNC), /* mandatory for write */
944 efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */ 944 efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 1abd3b7..9367716 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -258,7 +258,7 @@ efl_main(void *data EINA_UNUSED,
258 * the line_delimiter, then wait for a reply from the server, then 258 * the line_delimiter, then wait for a reply from the server, then
259 * write another. 259 * write another.
260 */ 260 */
261 send_queue = efl_add(EFL_IO_QUEUE_CLASS, ev->object, 261 send_queue = efl_add_ref(EFL_IO_QUEUE_CLASS, NULL,
262 efl_name_set(efl_added, "send_queue"), 262 efl_name_set(efl_added, "send_queue"),
263 efl_io_queue_limit_set(efl_added, buffer_limit)); 263 efl_io_queue_limit_set(efl_added, buffer_limit));
264 if (!send_queue) 264 if (!send_queue)
@@ -279,7 +279,7 @@ efl_main(void *data EINA_UNUSED,
279 * Our example's usage is to peek its data with slice_get() then 279 * Our example's usage is to peek its data with slice_get() then
280 * clear(). 280 * clear().
281 */ 281 */
282 receive_queue = efl_add(EFL_IO_QUEUE_CLASS, ev->object, 282 receive_queue = efl_add_ref(EFL_IO_QUEUE_CLASS, NULL,
283 efl_name_set(efl_added, "receive_queue"), 283 efl_name_set(efl_added, "receive_queue"),
284 efl_io_queue_limit_set(efl_added, buffer_limit), 284 efl_io_queue_limit_set(efl_added, buffer_limit),
285 efl_event_callback_add(efl_added, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL)); 285 efl_event_callback_add(efl_added, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL));
@@ -359,9 +359,9 @@ efl_main(void *data EINA_UNUSED,
359 error_sender: 359 error_sender:
360 efl_del(dialer); 360 efl_del(dialer);
361 error_dialer: 361 error_dialer:
362 efl_del(receive_queue); 362 efl_unref(receive_queue);
363 error_receive_queue: 363 error_receive_queue:
364 efl_del(send_queue); 364 efl_unref(send_queue);
365 end: 365 end:
366 EINA_LIST_FREE(commands, cmd) 366 EINA_LIST_FREE(commands, cmd)
367 { 367 {
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index 29a4b96..25188b3 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -350,11 +350,11 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
350 return; 350 return;
351 } 351 }
352 352
353 send_buffer = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get(), 353 send_buffer = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL,
354 efl_io_buffer_adopt_readonly(efl_added, hello_world_slice)); 354 efl_io_buffer_adopt_readonly(efl_added, hello_world_slice));
355 355
356 /* Unlimited buffer to store the received data. */ 356 /* Unlimited buffer to store the received data. */
357 recv_buffer = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get()); 357 recv_buffer = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
358 358
359 /* an input copier that takes data from send_buffer and pushes to client */ 359 /* an input copier that takes data from send_buffer and pushes to client */
360 d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), 360 d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client),
@@ -712,7 +712,7 @@ efl_main(void *data EINA_UNUSED,
712 cipher = EFL_NET_SSL_CIPHER_TLSV1_2; 712 cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
713 } 713 }
714 714
715 ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(), 715 ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
716 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)), 716 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
717 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)), 717 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
718 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)), 718 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index beb314b..998ad66 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -520,7 +520,7 @@ efl_main(void *data EINA_UNUSED,
520 cipher = EFL_NET_SSL_CIPHER_TLSV1_2; 520 cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
521 } 521 }
522 522
523 ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object, 523 ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
524 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)), 524 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
525 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)), 525 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
526 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)), 526 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index e3579b4..75acb0b 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -311,7 +311,7 @@ efl_terminate(void *data EINA_UNUSED,
311 efl_del(dialer); 311 efl_del(dialer);
312 dialer = NULL; 312 dialer = NULL;
313 313
314 efl_del(ssl_ctx); 314 efl_unref(ssl_ctx);
315 ssl_ctx = NULL; 315 ssl_ctx = NULL;
316 316
317 EINA_LIST_FREE(pending_send, str) free(str); 317 EINA_LIST_FREE(pending_send, str) free(str);
@@ -456,7 +456,7 @@ efl_main(void *data EINA_UNUSED,
456 /* create a new SSL context with command line configurations. 456 /* create a new SSL context with command line configurations.
457 * another option would be to use the default dialer context */ 457 * another option would be to use the default dialer context */
458#ifndef USE_DEFAULT_CONTEXT 458#ifndef USE_DEFAULT_CONTEXT
459 ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object, 459 ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
460 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)), 460 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
461 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)), 461 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
462 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)), 462 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
@@ -528,7 +528,7 @@ efl_main(void *data EINA_UNUSED,
528 efl_io_closer_close(dialer); /* just del won't do as ssl has an extra ref */ 528 efl_io_closer_close(dialer); /* just del won't do as ssl has an extra ref */
529 efl_del(dialer); 529 efl_del(dialer);
530 no_ssl_ctx: 530 no_ssl_ctx:
531 efl_del(ssl_ctx); 531 efl_unref(ssl_ctx);
532 532
533 end: 533 end:
534 EINA_LIST_FREE(pending_send, str) free(str); 534 EINA_LIST_FREE(pending_send, str) free(str);
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index 4b9171e..38e93b6 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -227,7 +227,7 @@ efl_terminate(void *data EINA_UNUSED,
227 efl_del(server); 227 efl_del(server);
228 server = NULL; 228 server = NULL;
229 229
230 efl_del(ssl_ctx); 230 efl_unref(ssl_ctx);
231 ssl_ctx = NULL; 231 ssl_ctx = NULL;
232 232
233 EINA_LIST_FREE(certificates, str) free(str); 233 EINA_LIST_FREE(certificates, str) free(str);
@@ -301,7 +301,7 @@ efl_main(void *data EINA_UNUSED,
301 cipher = EFL_NET_SSL_CIPHER_TLSV1_2; 301 cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
302 } 302 }
303 303
304 ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object, 304 ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
305 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)), 305 efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
306 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)), 306 efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
307 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)), 307 efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
@@ -363,7 +363,7 @@ efl_main(void *data EINA_UNUSED,
363 efl_del(server); 363 efl_del(server);
364 server = NULL; 364 server = NULL;
365 end_ctx: 365 end_ctx:
366 efl_del(ssl_ctx); 366 efl_unref(ssl_ctx);
367 367
368 end: 368 end:
369 EINA_LIST_FREE(certificates, str) free(str); 369 EINA_LIST_FREE(certificates, str) free(str);
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index f6b3e8a..e604e89 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -27,7 +27,7 @@ void
27monitor_stuff(void *data) 27monitor_stuff(void *data)
28{ 28{
29 const char *path = data; 29 const char *path = data;
30 Eio_Sentry *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 30 Eio_Sentry *sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
31 efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL); 31 efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
32 32
33 printf("Starting monitoring path %s\n", path); 33 printf("Starting monitoring path %s\n", path);
diff --git a/src/examples/elementary/efl_ui_scroller_example.c b/src/examples/elementary/efl_ui_scroller_example.c
index 99a7a55..4de4d21 100644
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -15,8 +15,8 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
15 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 15 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
16 elm_app_info_set(efl_main, "elementary", "images/plant_01.jpg"); 16 elm_app_info_set(efl_main, "elementary", "images/plant_01.jpg");
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC, 18 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, "TEST", ELM_WIN_BASIC,
19 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 19 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
20 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400)); 20 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400));
21 21
22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win); 22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
diff --git a/src/examples/elementary/efl_ui_view_list_example_1.c b/src/examples/elementary/efl_ui_view_list_example_1.c
index 5e86875..529d44c 100644
--- a/src/examples/elementary/efl_ui_view_list_example_1.c
+++ b/src/examples/elementary/efl_ui_view_list_example_1.c
@@ -49,7 +49,7 @@ _make_model()
49 unsigned int i, s; 49 unsigned int i, s;
50 char buf[256]; 50 char buf[256];
51 51
52 model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get()); 52 model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
53 eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING); 53 eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING);
54 54
55 for (i = 0; i < (NUM_ITEMS); i++) 55 for (i = 0; i < (NUM_ITEMS); i++)
diff --git a/src/examples/elementary/efl_ui_view_list_example_2.c b/src/examples/elementary/efl_ui_view_list_example_2.c
index 7b5ef4c..641d0a6 100644
--- a/src/examples/elementary/efl_ui_view_list_example_2.c
+++ b/src/examples/elementary/efl_ui_view_list_example_2.c
@@ -43,7 +43,7 @@ elm_main(int argc, char **argv)
43 if (argv[1] != NULL) dirname = argv[1]; 43 if (argv[1] != NULL) dirname = argv[1];
44 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 44 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
45 45
46 model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname)); 46 model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
47 factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win); 47 factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win);
48 efl_ui_model_connect(factory, "efl.text", "filename"); 48 efl_ui_model_connect(factory, "efl.text", "filename");
49 efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default"); 49 efl_ui_layout_factory_theme_config(factory, "list_item", NULL, "default");
diff --git a/src/examples/elementary/efl_ui_view_list_example_3.c b/src/examples/elementary/efl_ui_view_list_example_3.c
index 9e7507f..ece4e9c 100644
--- a/src/examples/elementary/efl_ui_view_list_example_3.c
+++ b/src/examples/elementary/efl_ui_view_list_example_3.c
@@ -173,7 +173,7 @@ _make_model()
173 Efl_Model_Item *model, *child; 173 Efl_Model_Item *model, *child;
174 unsigned int i, len; 174 unsigned int i, len;
175 175
176 model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get()); 176 model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
177 eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING); 177 eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING);
178 eina_value_setup(&value, EINA_VALUE_TYPE_UCHAR); 178 eina_value_setup(&value, EINA_VALUE_TYPE_UCHAR);
179 179
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 2b1e81d..6935e93 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -35,7 +35,6 @@ _cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
35 efl_unref(priv->fileview); 35 efl_unref(priv->fileview);
36 efl_unref(priv->treeview); 36 efl_unref(priv->treeview);
37 efl_unref(priv->formview); 37 efl_unref(priv->formview);
38 efl_unref(priv->treemodel);
39} 38}
40 39
41static int 40static int
@@ -125,12 +124,12 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
125 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 124 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
126 125
127 //treemodel 126 //treemodel
128 priv.treemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname)); 127 priv.treemodel = efl_add(EIO_MODEL_CLASS, win, eio_model_path_set(efl_added, dirname));
129 eio_model_children_filter_set(priv.treemodel, NULL, _filter_cb, NULL); 128 eio_model_children_filter_set(priv.treemodel, NULL, _filter_cb, NULL);
130 129
131 //treeview 130 //treeview
132 genlist = elm_genlist_add(win); 131 genlist = elm_genlist_add(win);
133 priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL)); 132 priv.treeview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL));
134 elm_view_list_property_connect(priv.treeview, "filename", "elm.text"); 133 elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
135 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon"); 134 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
136 elm_view_list_model_set(priv.treeview, priv.treemodel); 135 elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -145,7 +144,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
145 144
146 //listview 145 //listview
147 genlist = elm_genlist_add(win); 146 genlist = elm_genlist_add(win);
148 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); 147 priv.fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
149 elm_view_list_property_connect(priv.fileview, "filename", "elm.text"); 148 elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
150 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub"); 149 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub");
151 150
@@ -159,7 +158,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
159 bxr = elm_box_add(win); 158 bxr = elm_box_add(win);
160 _widget_init(bxr); 159 _widget_init(bxr);
161 elm_object_part_content_set(vpanes, "right", bxr); 160 elm_object_part_content_set(vpanes, "right", bxr);
162 priv.formview = efl_add(ELM_VIEW_FORM_CLASS, efl_main_loop_get()); 161 priv.formview = efl_add_ref(ELM_VIEW_FORM_CLASS, NULL);
163 162
164 /*Label widget */ 163 /*Label widget */
165 elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name")); 164 elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index d36295f..39df4f8 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -54,8 +54,8 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_show(genlist); 55 evas_object_show(genlist);
56 56
57 priv.filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname)); 57 priv.filemodel = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
58 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); 58 priv.fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
59 elm_view_list_model_set(priv.fileview, priv.filemodel); 59 elm_view_list_model_set(priv.fileview, priv.filemodel);
60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv); 60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
61 61
diff --git a/src/examples/elementary/layout_model_connect.c b/src/examples/elementary/layout_model_connect.c
index 7021a2c..e93b344 100644
--- a/src/examples/elementary/layout_model_connect.c
+++ b/src/examples/elementary/layout_model_connect.c
@@ -111,10 +111,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
111 if (argv[1] != NULL) dirname = argv[1]; 111 if (argv[1] != NULL) dirname = argv[1];
112 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 112 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
113 113
114 priv->model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname)); 114 priv->model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
115 115
116 genlist = elm_genlist_add(win); 116 genlist = elm_genlist_add(win);
117 priv->fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, NULL)); 117 priv->fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, NULL));
118 elm_view_list_property_connect(priv->fileview, "filename", "elm.text"); 118 elm_view_list_property_connect(priv->fileview, "filename", "elm.text");
119 elm_view_list_model_set(priv->fileview, priv->model); 119 elm_view_list_model_set(priv->fileview, priv->model);
120 _widget_init(genlist); 120 _widget_init(genlist);
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 097d233..e2fbb68 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -311,7 +311,7 @@ _efl_net_ip_address_create(Eo *cls, void *pd EINA_UNUSED, uint16_t port, const E
311 else 311 else
312 family = AF_INET; 312 family = AF_INET;
313 313
314 return efl_add_ref(cls, NULL, 314 return efl_add_ref(cls, efl_main_loop_get(),
315 efl_net_ip_address_family_set(efl_added, family), 315 efl_net_ip_address_family_set(efl_added, family),
316 efl_net_ip_address_port_set(efl_added, port), 316 efl_net_ip_address_port_set(efl_added, port),
317 efl_net_ip_address_set(efl_added, address)); 317 efl_net_ip_address_set(efl_added, address));
@@ -325,7 +325,7 @@ _efl_net_ip_address_create_sockaddr(Eo *cls, void *pd EINA_UNUSED, const void *p
325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL); 325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL);
326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL); 326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL);
327 327
328 return efl_add_ref(cls, NULL, 328 return efl_add_ref(cls, efl_main_loop_get(),
329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr)); 329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr));
330} 330}
331 331
@@ -368,7 +368,7 @@ _efl_net_ip_address_parse(Eo *cls, void *pd EINA_UNUSED, const char *numeric_add
368 return NULL; 368 return NULL;
369 } 369 }
370 370
371 return efl_add_ref(cls, NULL, 371 return efl_add_ref(cls, efl_main_loop_get(),
372 efl_net_ip_address_sockaddr_set(efl_added, &ss)); 372 efl_net_ip_address_sockaddr_set(efl_added, &ss));
373} 373}
374 374
diff --git a/src/lib/ecore_con/efl_net_ssl_context.c b/src/lib/ecore_con/efl_net_ssl_context.c
index 62de44d..e1bc090 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.c
+++ b/src/lib/ecore_con/efl_net_ssl_context.c
@@ -361,7 +361,7 @@ _efl_net_ssl_context_default_dialer_get(const Efl_Class *klass, void *pd EINA_UN
361{ 361{
362 if (!_efl_net_ssl_context_default_dialer) 362 if (!_efl_net_ssl_context_default_dialer)
363 { 363 {
364 _efl_net_ssl_context_default_dialer = efl_add_ref(klass, NULL, 364 _efl_net_ssl_context_default_dialer = efl_add(klass, efl_main_loop_get(),
365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED), 365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED),
366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE), 366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE),
367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE), 367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE),
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index da3401a..fc0b830 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3511,7 +3511,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee,
3511 3511
3512 efl_event_callback_legacy_call(ee->evas, 3512 efl_event_callback_legacy_call(ee->evas,
3513 _event_description_get(ev->action), evt); 3513 _event_description_get(ev->action), evt);
3514 efl_unref(evt); 3514 efl_del(evt);
3515} 3515}
3516 3516
3517EAPI void 3517EAPI void
@@ -4729,7 +4729,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4729 4729
4730 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4730 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4731 processed = ev->evas_done; 4731 processed = ev->evas_done;
4732 efl_unref(evt); 4732 efl_del(evt);
4733 4733
4734 return processed; 4734 return processed;
4735} 4735}
@@ -4764,7 +4764,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4764 4764
4765 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4765 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4766 processed = ev->evas_done; 4766 processed = ev->evas_done;
4767 efl_unref(evt); 4767 efl_del(evt);
4768 4768
4769 return processed; 4769 return processed;
4770} 4770}
@@ -4794,7 +4794,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4794 4794
4795 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4795 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4796 processed = ev->evas_done; 4796 processed = ev->evas_done;
4797 efl_unref(evt); 4797 efl_del(evt);
4798 4798
4799 return processed; 4799 return processed;
4800} 4800}
@@ -4924,7 +4924,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4924 4924
4925 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4925 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4926 processed = ev->evas_done; 4926 processed = ev->evas_done;
4927 efl_unref(evt); 4927 efl_del(evt);
4928 4928
4929 return processed; 4929 return processed;
4930} 4930}
@@ -4966,7 +4966,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
4966 efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt); 4966 efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt);
4967 4967
4968 processed = ev->evas_done; 4968 processed = ev->evas_done;
4969 efl_unref(evt); 4969 efl_del(evt);
4970 4970
4971 return processed; 4971 return processed;
4972} 4972}
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index bd49820..338fb66 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -153,7 +153,7 @@ shutdown_all:
153 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); 153 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
154 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); 154 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
155 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); 155 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
156 efl_del(_edje_global_obj); 156 efl_unref(_edje_global_obj);
157 _edje_global_obj = NULL; 157 _edje_global_obj = NULL;
158 } 158 }
159shutdown_efreet: 159shutdown_efreet:
@@ -212,7 +212,7 @@ _edje_shutdown_core(void)
212 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); 212 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
213 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); 213 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
214 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); 214 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
215 efl_del(_edje_global_obj); 215 efl_unref(_edje_global_obj);
216 _edje_global_obj = NULL; 216 _edje_global_obj = NULL;
217 217
218 eina_cow_del(_edje_calc_params_map_cow); 218 eina_cow_del(_edje_calc_params_map_cow);
@@ -286,17 +286,17 @@ _edje_class_shutdown(void)
286{ 286{
287 if (_edje_color_class_member) 287 if (_edje_color_class_member)
288 { 288 {
289 efl_del(_edje_color_class_member); 289 efl_unref(_edje_color_class_member);
290 _edje_color_class_member = NULL; 290 _edje_color_class_member = NULL;
291 } 291 }
292 if (_edje_text_class_member) 292 if (_edje_text_class_member)
293 { 293 {
294 efl_del(_edje_text_class_member); 294 efl_unref(_edje_text_class_member);
295 _edje_text_class_member = NULL; 295 _edje_text_class_member = NULL;
296 } 296 }
297 if (_edje_size_class_member) 297 if (_edje_size_class_member)
298 { 298 {
299 efl_del(_edje_size_class_member); 299 efl_unref(_edje_size_class_member);
300 _edje_size_class_member = NULL; 300 _edje_size_class_member = NULL;
301 } 301 }
302} 302}
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 0af6ec4..0d99826 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -10,14 +10,14 @@ static Eina_Bool outfail = EINA_FALSE;
10static void 10static void
11_play_finished(void *data EINA_UNUSED, const Efl_Event *event) 11_play_finished(void *data EINA_UNUSED, const Efl_Event *event)
12{ 12{
13 efl_del(event->object); 13 efl_unref(event->object);
14} 14}
15 15
16static void 16static void
17_out_fail(void *data EINA_UNUSED, const Efl_Event *event) 17_out_fail(void *data EINA_UNUSED, const Efl_Event *event)
18{ 18{
19 outfail = EINA_TRUE; 19 outfail = EINA_TRUE;
20 efl_del(event->object); 20 efl_unref(event->object);
21 out = NULL; 21 out = NULL;
22} 22}
23 23
@@ -199,15 +199,15 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
199 eet_data->vio.tell = eet_snd_file_tell; 199 eet_data->vio.tell = eet_snd_file_tell;
200 eet_data->offset = 0; 200 eet_data->offset = 0;
201 201
202 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get(), efl_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); 202 in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, efl_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
203 if (!out) 203 if (!out)
204 { 204 {
205 205
206# ifdef _WIN32 206# ifdef _WIN32
207 out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 207 out = efl_add_ref(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
208# else 208# else
209# ifdef HAVE_PULSE 209# ifdef HAVE_PULSE
210 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 210 out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
211# endif 211# endif
212# endif 212# endif
213 if (out) outs++; 213 if (out) outs++;
@@ -227,7 +227,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
227# endif 227# endif
228# endif 228# endif
229 } 229 }
230 efl_del(in); 230 efl_unref(in);
231 return EINA_FALSE; 231 return EINA_FALSE;
232 } 232 }
233 ret = ecore_audio_obj_out_input_attach(out, in); 233 ret = ecore_audio_obj_out_input_attach(out, in);
@@ -240,7 +240,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
240 complained = EINA_TRUE; 240 complained = EINA_TRUE;
241 ERR("Could not attach input"); 241 ERR("Could not attach input");
242 } 242 }
243 efl_del(in); 243 efl_unref(in);
244 return EINA_FALSE; 244 return EINA_FALSE;
245 } 245 }
246 } 246 }
@@ -283,7 +283,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
283 tone = &ed->file->sound_dir->tones[i]; 283 tone = &ed->file->sound_dir->tones[i];
284 if (!strcmp(tone->name, tone_name)) 284 if (!strcmp(tone->name, tone_name))
285 { 285 {
286 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get()); 286 in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
287 efl_name_set(in, "tone"); 287 efl_name_set(in, "tone");
288 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value); 288 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value);
289 ecore_audio_obj_in_length_set(in, duration); 289 ecore_audio_obj_in_length_set(in, duration);
@@ -292,10 +292,10 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
292 if (!out) 292 if (!out)
293 { 293 {
294# ifdef _WIN32 294# ifdef _WIN32
295 out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 295 out = efl_add_ref(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
296# else 296# else
297# ifdef HAVE_PULSE 297# ifdef HAVE_PULSE
298 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 298 out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
299# endif 299# endif
300# endif 300# endif
301 if (out) outs++; 301 if (out) outs++;
@@ -305,7 +305,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
305 if (!ret) 305 if (!ret)
306 { 306 {
307 ERR("Could not attach input"); 307 ERR("Could not attach input");
308 efl_del(in); 308 efl_unref(in);
309 return EINA_FALSE; 309 return EINA_FALSE;
310 } 310 }
311 } 311 }
@@ -353,7 +353,7 @@ _edje_multisense_shutdown(void)
353 if (out) 353 if (out)
354 { 354 {
355 // XXX: this causes an abort inside of pa!!!!! 355 // XXX: this causes an abort inside of pa!!!!!
356 //efl_del(out); 356 //efl_unref(out);
357 out = NULL; 357 out = NULL;
358 outs = 0; 358 outs = 0;
359 } 359 }
diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c
index 8933bab..abcb0d5 100644
--- a/src/lib/elementary/efl_ui_view_list.c
+++ b/src/lib/elementary/efl_ui_view_list.c
@@ -674,7 +674,7 @@ _efl_ui_view_list_efl_object_finalize(Eo *obj, Efl_Ui_View_List_Data *pd)
674{ 674{
675 675
676 if (!pd->factory) 676 if (!pd->factory)
677 pd->factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS)); 677 pd->factory = efl_add_ref(EFL_UI_LAYOUT_FACTORY_CLASS, NULL);
678 678
679 if(!pd->relayout) 679 if(!pd->relayout)
680 { 680 {
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index b1d263b..ec59905 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -202,7 +202,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
202 if (path) priv->fsd.path = eina_stringshare_add(path); 202 if (path) priv->fsd.path = eina_stringshare_add(path);
203 else priv->fsd.path = eina_stringshare_add("/"); 203 else priv->fsd.path = eina_stringshare_add("/");
204 204
205 priv->fsd.model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, priv->fsd.path)); 205 priv->fsd.model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, priv->fsd.path));
206 206
207 priv->fsd.expandable = _elm_config->fileselector_expand_enable; 207 priv->fsd.expandable = _elm_config->fileselector_expand_enable;
208 priv->inwin_mode = _elm_config->inwin_dialogs_enable; 208 priv->inwin_mode = _elm_config->inwin_dialogs_enable;
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 4cd74d5..c430f33 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -4556,7 +4556,7 @@ _elm_atspi_bridge_init(void)
4556{ 4556{
4557 if (!_init_count) 4557 if (!_init_count)
4558 { 4558 {
4559 _instance = efl_add(ELM_ATSPI_BRIDGE_CLASS, efl_main_loop_get()); 4559 _instance = efl_add_ref(ELM_ATSPI_BRIDGE_CLASS, NULL);
4560 _init_count = 1; 4560 _init_count = 1;
4561 } 4561 }
4562} 4562}
@@ -4572,7 +4572,7 @@ _elm_atspi_bridge_shutdown(void)
4572{ 4572{
4573 if (_init_count) 4573 if (_init_count)
4574 { 4574 {
4575 efl_del(_instance); 4575 efl_unref(_instance);
4576 _init_count = 0; 4576 _init_count = 0;
4577 } 4577 }
4578 _efl_access_shutdown(); 4578 _efl_access_shutdown();
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index a993a8c..f7da6fe 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -228,7 +228,7 @@ _elm_unneed_sys_notify(void)
228 if (manager) 228 if (manager)
229 { 229 {
230 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE); 230 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
231 efl_del(manager); 231 efl_unref(manager);
232 } 232 }
233} 233}
234 234
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 69bbaf6..0537014 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -57,14 +57,14 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_pulse)
57 Eina_Bool ret = EINA_FALSE; 57 Eina_Bool ret = EINA_FALSE;
58 Eina_Bool pulse_context_failed = EINA_FALSE; 58 Eina_Bool pulse_context_failed = EINA_FALSE;
59 59
60 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get()); 60 in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
61 fail_if(!in); 61 fail_if(!in);
62 62
63 efl_name_set(in, "sample.wav"); 63 efl_name_set(in, "sample.wav");
64 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav"); 64 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav");
65 fail_if(!ret); 65 fail_if(!ret);
66 66
67 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get()); 67 out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
68 fail_if(!out); 68 fail_if(!out);
69 69
70 ecore_timer_add(1.8, _seek_vol, in); 70 ecore_timer_add(1.8, _seek_vol, in);
@@ -78,8 +78,8 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_pulse)
78 ecore_main_loop_begin(); 78 ecore_main_loop_begin();
79 fail_if(pulse_context_failed); 79 fail_if(pulse_context_failed);
80 80
81 efl_del(out); 81 efl_unref(out);
82 efl_del(in); 82 efl_unref(in);
83} 83}
84EFL_END_TEST 84EFL_END_TEST
85#endif 85#endif
@@ -96,7 +96,7 @@ static Eina_Bool
96_idle_del(void *data) 96_idle_del(void *data)
97{ 97{
98 Eo *in = data; 98 Eo *in = data;
99 efl_del(in); 99 efl_unref(in);
100 ecore_idler_add(_quit, NULL); 100 ecore_idler_add(_quit, NULL);
101 101
102 return EINA_FALSE; 102 return EINA_FALSE;
@@ -108,12 +108,12 @@ EFL_START_TEST(ecore_test_ecore_audio_cleanup)
108 int freq = 1000; 108 int freq = 1000;
109 Eina_Bool ret = EINA_FALSE; 109 Eina_Bool ret = EINA_FALSE;
110 110
111 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get()); 111 in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
112 fail_if(!in); 112 fail_if(!in);
113 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); 113 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
114 ecore_audio_obj_in_length_set(in, 2); 114 ecore_audio_obj_in_length_set(in, 2);
115 115
116 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get()); 116 out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
117 fail_if(!out); 117 fail_if(!out);
118 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG); 118 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG);
119 fail_if(!ret); 119 fail_if(!ret);
@@ -124,7 +124,6 @@ EFL_START_TEST(ecore_test_ecore_audio_cleanup)
124 fail_if(!ret); 124 fail_if(!ret);
125 125
126 ecore_idler_add(_idle_del, in); 126 ecore_idler_add(_idle_del, in);
127 ecore_idler_add(_idle_del, out);
128 127
129 ecore_main_loop_begin(); 128 ecore_main_loop_begin();
130 129
@@ -140,7 +139,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
140 Eina_Bool ret; 139 Eina_Bool ret;
141 char *tmp; 140 char *tmp;
142 141
143 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get()); 142 in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
144 fail_if(!in); 143 fail_if(!in);
145 144
146 efl_name_set(in, "tone"); 145 efl_name_set(in, "tone");
@@ -198,7 +197,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
198 len = ecore_audio_obj_in_remaining_get(in); 197 len = ecore_audio_obj_in_remaining_get(in);
199 fail_if(len != 1.0); 198 fail_if(len != 1.0);
200 199
201 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get()); 200 out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
202 fail_if(!out); 201 fail_if(!out);
203 202
204 efl_name_set(out, "tmp.wav"); 203 efl_name_set(out, "tmp.wav");
@@ -215,8 +214,8 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
215 214
216 ecore_main_loop_begin(); 215 ecore_main_loop_begin();
217 216
218 efl_del(in); 217 efl_unref(in);
219 efl_del(out); 218 efl_unref(out);
220 219
221 //TODO: Compare and fail 220 //TODO: Compare and fail
222 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 221 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -232,7 +231,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_sndfile)
232 Ecore_Audio_Format fmt; 231 Ecore_Audio_Format fmt;
233 const char *src; 232 const char *src;
234 233
235 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get()); 234 in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
236 fail_if(!in); 235 fail_if(!in);
237 236
238 fmt = ecore_audio_obj_format_get(in); 237 fmt = ecore_audio_obj_format_get(in);
@@ -278,7 +277,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_sndfile)
278 len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END); 277 len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END);
279 fail_if(fabs(rem - 1 - len) > 0.6); 278 fail_if(fabs(rem - 1 - len) > 0.6);
280 279
281 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get()); 280 out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
282 fail_if(!out); 281 fail_if(!out);
283 282
284 efl_name_set(out, "tmp.wav"); 283 efl_name_set(out, "tmp.wav");
@@ -305,8 +304,8 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_sndfile)
305 304
306 ecore_main_loop_begin(); 305 ecore_main_loop_begin();
307 306
308 efl_del(in); 307 efl_unref(in);
309 efl_del(out); 308 efl_unref(out);
310 309
311 //TODO: Compare and fail 310 //TODO: Compare and fail
312 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 311 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -319,9 +318,9 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in_out)
319 Eina_List *in3; 318 Eina_List *in3;
320 Eina_Bool attached; 319 Eina_Bool attached;
321 320
322 Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get()); 321 Eo *in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
323 Eo *in2 = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get()); 322 Eo *in2 = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
324 Eo *out = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get()); 323 Eo *out = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
325 324
326 fail_if(!in); 325 fail_if(!in);
327 fail_if(!in2); 326 fail_if(!in2);
@@ -358,20 +357,20 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in_out)
358 fail_if(eina_list_count(in3) != 2); 357 fail_if(eina_list_count(in3) != 2);
359 fail_if(eina_list_data_get(in3) != in); 358 fail_if(eina_list_data_get(in3) != in);
360 359
361 efl_del(in2); 360 efl_unref(in2);
362 361
363 in3 = ecore_audio_obj_out_inputs_get(out); 362 in3 = ecore_audio_obj_out_inputs_get(out);
364 363
365 fail_if(eina_list_count(in3) != 1); 364 fail_if(eina_list_count(in3) != 1);
366 fail_if(eina_list_data_get(in3) != in); 365 fail_if(eina_list_data_get(in3) != in);
367 366
368 efl_del(out); 367 efl_unref(out);
369 368
370 out2 = ecore_audio_obj_in_output_get(in); 369 out2 = ecore_audio_obj_in_output_get(in);
371 370
372 fail_if(out2); 371 fail_if(out2);
373 372
374 efl_del(in); 373 efl_unref(in);
375} 374}
376EFL_END_TEST 375EFL_END_TEST
377 376
@@ -417,10 +416,10 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_vio)
417{ 416{
418 Eo *in, *out; 417 Eo *in, *out;
419 418
420 in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get()); 419 in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
421 fail_if(!in); 420 fail_if(!in);
422 421
423 out = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get()); 422 out = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
424 fail_if(!out); 423 fail_if(!out);
425 424
426 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL); 425 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL);
@@ -430,8 +429,8 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_vio)
430 429
431 ecore_main_loop_begin(); 430 ecore_main_loop_begin();
432 431
433 efl_del(out); 432 efl_unref(out);
434 efl_del(in); 433 efl_unref(in);
435} 434}
436EFL_END_TEST 435EFL_END_TEST
437 436
@@ -455,7 +454,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in)
455 Ecore_Audio_Vio vio; 454 Ecore_Audio_Vio vio;
456 Eina_Bool freed = EINA_FALSE; 455 Eina_Bool freed = EINA_FALSE;
457 456
458 Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get()); 457 Eo *in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
459 458
460 fail_if(!in); 459 fail_if(!in);
461 460
@@ -530,7 +529,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in)
530 fail_if(buf[i] != 0x00); 529 fail_if(buf[i] != 0x00);
531 } 530 }
532 531
533 efl_del(in); 532 efl_unref(in);
534} 533}
535EFL_END_TEST 534EFL_END_TEST
536 535
@@ -542,10 +541,10 @@ EFL_START_TEST(ecore_test_ecore_audio_obj)
542 double volume; 541 double volume;
543 Eo *objs[2], *obj; 542 Eo *objs[2], *obj;
544 543
545 objs[0] = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get()); 544 objs[0] = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
546 fail_if(!objs[0]); 545 fail_if(!objs[0]);
547 546
548 objs[1] = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get()); 547 objs[1] = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
549 fail_if(!objs[1]); 548 fail_if(!objs[1]);
550 549
551 for (i=0; i<2; i++) { 550 for (i=0; i<2; i++) {
@@ -578,7 +577,7 @@ EFL_START_TEST(ecore_test_ecore_audio_obj)
578 volume = ecore_audio_obj_volume_get(obj); 577 volume = ecore_audio_obj_volume_get(obj);
579 fail_if(volume != 0.5); 578 fail_if(volume != 0.5);
580 579
581 efl_del(obj); 580 efl_unref(obj);
582 } 581 }
583 582
584} 583}
diff --git a/src/tests/ecore/efl_app_test_promise.c b/src/tests/ecore/efl_app_test_promise.c
index 3b9b8ab..fde8879 100644
--- a/src/tests/ecore/efl_app_test_promise.c
+++ b/src/tests/ecore/efl_app_test_promise.c
@@ -872,7 +872,7 @@ EFL_START_TEST(efl_test_promise_eo)
872 fail_if(!ecore_init()); 872 fail_if(!ecore_init());
873 873
874 //Use a random object.. 874 //Use a random object..
875 obj = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get()); 875 obj = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
876 fail_if(!obj); 876 fail_if(!obj);
877 efl_key_data_set(obj, "free_called", &free_called); 877 efl_key_data_set(obj, "free_called", &free_called);
878 f = eina_future_chain(_int_future_get(), 878 f = eina_future_chain(_int_future_get(),
@@ -931,7 +931,7 @@ EFL_START_TEST(efl_test_promise_eo_link)
931 fail_if(!ecore_init()); 931 fail_if(!ecore_init());
932 932
933 //Use a random object.. 933 //Use a random object..
934 obj = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get()); 934 obj = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
935 fail_if(!obj); 935 fail_if(!obj);
936 936
937 efl_key_data_set(obj, "err_called", &err_called); 937 efl_key_data_set(obj, "err_called", &err_called);
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index b44bd0b..bc4fa98 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -282,29 +282,29 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
282 282
283 addr.sin_port = htons(12345); 283 addr.sin_port = htons(12345);
284 addr.sin_addr.s_addr = htonl(0xabcdefafU); 284 addr.sin_addr.s_addr = htonl(0xabcdefafU);
285 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 285 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
286 efl_net_ip_address_family_set(efl_added, AF_INET), 286 efl_net_ip_address_family_set(efl_added, AF_INET),
287 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)), 287 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
288 efl_net_ip_address_set(efl_added, slice)); 288 efl_net_ip_address_set(efl_added, slice));
289 _ipv4_check(o, &addr); 289 _ipv4_check(o, &addr);
290 efl_del(o); 290 efl_unref(o);
291 291
292 addr.sin_port = htons(8081); 292 addr.sin_port = htons(8081);
293 addr.sin_addr.s_addr = htonl(0); 293 addr.sin_addr.s_addr = htonl(0);
294 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 294 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
295 efl_net_ip_address_family_set(efl_added, AF_INET), 295 efl_net_ip_address_family_set(efl_added, AF_INET),
296 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)), 296 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
297 efl_net_ip_address_set(efl_added, slice)); 297 efl_net_ip_address_set(efl_added, slice));
298 _ipv4_check(o, &addr); 298 _ipv4_check(o, &addr);
299 efl_del(o); 299 efl_unref(o);
300 300
301 addr.sin_port = htons(0); 301 addr.sin_port = htons(0);
302 addr.sin_addr.s_addr = htonl(0x12345678); 302 addr.sin_addr.s_addr = htonl(0x12345678);
303 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 303 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
304 efl_net_ip_address_family_set(efl_added, AF_INET), 304 efl_net_ip_address_family_set(efl_added, AF_INET),
305 efl_net_ip_address_set(efl_added, slice)); 305 efl_net_ip_address_set(efl_added, slice));
306 _ipv4_check(o, &addr); 306 _ipv4_check(o, &addr);
307 efl_del(o); 307 efl_unref(o);
308} 308}
309EFL_END_TEST 309EFL_END_TEST
310 310
@@ -319,46 +319,46 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
319 Eo *o; 319 Eo *o;
320 320
321 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true"); 321 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
322 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get()); 322 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL);
323 ck_assert_ptr_eq(o, NULL); 323 ck_assert_ptr_eq(o, NULL);
324 TRAP_ERRORS_FINISH(1); 324 TRAP_ERRORS_FINISH(1);
325 325
326 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 326 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
327 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 327 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
328 efl_net_ip_address_family_set(efl_added, 12345)); 328 efl_net_ip_address_family_set(efl_added, 12345));
329 ck_assert_ptr_eq(o, NULL); 329 ck_assert_ptr_eq(o, NULL);
330 TRAP_ERRORS_FINISH(2); 330 TRAP_ERRORS_FINISH(2);
331 331
332 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true"); 332 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
333 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 333 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
334 efl_net_ip_address_set(efl_added, wrong_slice)); 334 efl_net_ip_address_set(efl_added, wrong_slice));
335 ck_assert_ptr_eq(o, NULL); 335 ck_assert_ptr_eq(o, NULL);
336 TRAP_ERRORS_FINISH(2); 336 TRAP_ERRORS_FINISH(2);
337 337
338 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true"); 338 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
339 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 339 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
340 efl_net_ip_address_port_set(efl_added, 1234)); 340 efl_net_ip_address_port_set(efl_added, 1234));
341 ck_assert_ptr_eq(o, NULL); 341 ck_assert_ptr_eq(o, NULL);
342 TRAP_ERRORS_FINISH(2); 342 TRAP_ERRORS_FINISH(2);
343 343
344 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true"); 344 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
345 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 345 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
346 efl_net_ip_address_port_set(efl_added, 1234), 346 efl_net_ip_address_port_set(efl_added, 1234),
347 efl_net_ip_address_set(efl_added, wrong_slice)); 347 efl_net_ip_address_set(efl_added, wrong_slice));
348 ck_assert_ptr_eq(o, NULL); 348 ck_assert_ptr_eq(o, NULL);
349 TRAP_ERRORS_FINISH(3); 349 TRAP_ERRORS_FINISH(3);
350 350
351 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true"); 351 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
352 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 352 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
353 efl_net_ip_address_family_set(efl_added, AF_INET), 353 efl_net_ip_address_family_set(efl_added, AF_INET),
354 efl_net_ip_address_set(efl_added, wrong_slice)); 354 efl_net_ip_address_set(efl_added, wrong_slice));
355 _ipv4_check(o, &addr); 355 _ipv4_check(o, &addr);
356 efl_del(o); 356 efl_unref(o);
357 TRAP_ERRORS_FINISH(1); 357 TRAP_ERRORS_FINISH(1);
358 358
359 addr.sin_port = htons(12345); 359 addr.sin_port = htons(12345);
360 addr.sin_addr.s_addr = htonl(0xabcdefafU); 360 addr.sin_addr.s_addr = htonl(0xabcdefafU);
361 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 361 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
362 efl_net_ip_address_family_set(efl_added, AF_INET), 362 efl_net_ip_address_family_set(efl_added, AF_INET),
363 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)), 363 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
364 efl_net_ip_address_set(efl_added, slice)); 364 efl_net_ip_address_set(efl_added, slice));
@@ -388,7 +388,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
388 efl_net_ip_address_set(o, slice); 388 efl_net_ip_address_set(o, slice);
389 TRAP_ERRORS_FINISH(1); 389 TRAP_ERRORS_FINISH(1);
390 390
391 efl_del(o); 391 efl_unref(o);
392} 392}
393EFL_END_TEST 393EFL_END_TEST
394 394
@@ -713,21 +713,21 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
713 713
714 addr.sin6_port = htons(12345); 714 addr.sin6_port = htons(12345);
715 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8); 715 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
716 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 716 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
717 efl_net_ip_address_family_set(efl_added, AF_INET6), 717 efl_net_ip_address_family_set(efl_added, AF_INET6),
718 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)), 718 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
719 efl_net_ip_address_set(efl_added, slice)); 719 efl_net_ip_address_set(efl_added, slice));
720 _ipv6_check(o, &addr); 720 _ipv6_check(o, &addr);
721 efl_del(o); 721 efl_unref(o);
722 722
723 addr.sin6_port = htons(8081); 723 addr.sin6_port = htons(8081);
724 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0); 724 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
725 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 725 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
726 efl_net_ip_address_family_set(efl_added, AF_INET6), 726 efl_net_ip_address_family_set(efl_added, AF_INET6),
727 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)), 727 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
728 efl_net_ip_address_set(efl_added, slice)); 728 efl_net_ip_address_set(efl_added, slice));
729 _ipv6_check(o, &addr); 729 _ipv6_check(o, &addr);
730 efl_del(o); 730 efl_unref(o);
731 731
732} 732}
733EFL_END_TEST 733EFL_END_TEST
@@ -745,16 +745,16 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
745 /* generic errors checked at ecore_test_efl_net_ip_address_ipv4_manual_fail */ 745 /* generic errors checked at ecore_test_efl_net_ip_address_ipv4_manual_fail */
746 746
747 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true"); 747 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
748 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 748 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
749 efl_net_ip_address_family_set(efl_added, AF_INET6), 749 efl_net_ip_address_family_set(efl_added, AF_INET6),
750 efl_net_ip_address_set(efl_added, wrong_slice)); 750 efl_net_ip_address_set(efl_added, wrong_slice));
751 _ipv6_check(o, &addr); 751 _ipv6_check(o, &addr);
752 efl_del(o); 752 efl_unref(o);
753 TRAP_ERRORS_FINISH(1); 753 TRAP_ERRORS_FINISH(1);
754 754
755 addr.sin6_port = htons(12345); 755 addr.sin6_port = htons(12345);
756 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1); 756 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1);
757 o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(), 757 o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
758 efl_net_ip_address_family_set(efl_added, AF_INET6), 758 efl_net_ip_address_family_set(efl_added, AF_INET6),
759 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)), 759 efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
760 efl_net_ip_address_set(efl_added, slice)); 760 efl_net_ip_address_set(efl_added, slice));
@@ -784,7 +784,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
784 efl_net_ip_address_set(o, slice); 784 efl_net_ip_address_set(o, slice);
785 TRAP_ERRORS_FINISH(1); 785 TRAP_ERRORS_FINISH(1);
786 786
787 efl_del(o); 787 efl_unref(o);
788 788
789} 789}
790EFL_END_TEST 790EFL_END_TEST
diff --git a/src/tests/efl/efl_test_model_composite.c b/src/tests/efl/efl_test_model_composite.c
index 7e9932d..bbc21bf 100644
--- a/src/tests/efl/efl_test_model_composite.c
+++ b/src/tests/efl/efl_test_model_composite.c
@@ -108,7 +108,7 @@ EFL_START_TEST(efl_test_model_composite_boolean)
108 108
109 eina_value_setup(&v, EINA_VALUE_TYPE_INT); 109 eina_value_setup(&v, EINA_VALUE_TYPE_INT);
110 110
111 base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get()); 111 base_model = efl_add_ref(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
112 ck_assert(!!base_model); 112 ck_assert(!!base_model);
113 113
114 for (i = 0; i < child_number; ++i) 114 for (i = 0; i < child_number; ++i)
@@ -119,7 +119,7 @@ EFL_START_TEST(efl_test_model_composite_boolean)
119 efl_model_property_set(child, "test_p_int", &v); 119 efl_model_property_set(child, "test_p_int", &v);
120 } 120 }
121 121
122 model = efl_add(EFL_MODEL_COMPOSITE_BOOLEAN_CLASS, efl_main_loop_get(), 122 model = efl_add_ref(EFL_MODEL_COMPOSITE_BOOLEAN_CLASS, efl_main_loop_get(),
123 efl_ui_view_model_set(efl_added, base_model), 123 efl_ui_view_model_set(efl_added, base_model),
124 efl_model_composite_boolean_add(efl_added, "test_p_true", EINA_TRUE), 124 efl_model_composite_boolean_add(efl_added, "test_p_true", EINA_TRUE),
125 efl_model_composite_boolean_add(efl_added, "test_p_false", EINA_FALSE)); 125 efl_model_composite_boolean_add(efl_added, "test_p_false", EINA_FALSE));
@@ -151,7 +151,7 @@ EFL_START_TEST(efl_test_model_composite_selection)
151 151
152 eina_value_setup(&v, EINA_VALUE_TYPE_INT); 152 eina_value_setup(&v, EINA_VALUE_TYPE_INT);
153 153
154 base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get()); 154 base_model = efl_add_ref(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
155 ck_assert(!!base_model); 155 ck_assert(!!base_model);
156 156
157 for (i = 0; i < child_number; ++i) 157 for (i = 0; i < child_number; ++i)
@@ -162,7 +162,7 @@ EFL_START_TEST(efl_test_model_composite_selection)
162 efl_model_property_set(child, "test_p_int", &v); 162 efl_model_property_set(child, "test_p_int", &v);
163 } 163 }
164 164
165 model = efl_add(EFL_MODEL_COMPOSITE_SELECTION_CLASS, efl_main_loop_get(), 165 model = efl_add_ref(EFL_MODEL_COMPOSITE_SELECTION_CLASS, efl_main_loop_get(),
166 efl_ui_view_model_set(efl_added, base_model)); 166 efl_ui_view_model_set(efl_added, base_model));
167 ck_assert(!!model); 167 ck_assert(!!model);
168 future = efl_model_property_set(model, "selected", eina_value_int_new(2)); 168 future = efl_model_property_set(model, "selected", eina_value_int_new(2));
diff --git a/src/tests/efl/efl_test_model_container.c b/src/tests/efl/efl_test_model_container.c
index 50a2fd4..0ccd341 100644
--- a/src/tests/efl/efl_test_model_container.c
+++ b/src/tests/efl/efl_test_model_container.c
@@ -89,7 +89,7 @@ EFL_START_TEST(efl_test_model_container_values)
89 cmp_str[i] = strdup(base_str[i]); 89 cmp_str[i] = strdup(base_str[i]);
90 } 90 }
91 91
92 model = efl_add(EFL_MODEL_CONTAINER_CLASS, efl_main_loop_get()); 92 model = efl_add_ref(EFL_MODEL_CONTAINER_CLASS, NULL);
93 93
94 efl_model_container_child_property_add(model, "test_p_int", EINA_VALUE_TYPE_INT, 94 efl_model_container_child_property_add(model, "test_p_int", EINA_VALUE_TYPE_INT,
95 eina_carray_iterator_new((void**)cmp_int)); 95 eina_carray_iterator_new((void**)cmp_int));
diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c
index 346ef2c..3f5562c 100644
--- a/src/tests/efl_mono/libefl_mono_native_test.c
+++ b/src/tests/efl_mono/libefl_mono_native_test.c
@@ -88,7 +88,7 @@ char **_new_str_ref(const char* str)
88static 88static
89Test_Numberwrapper *_new_obj(int n) 89Test_Numberwrapper *_new_obj(int n)
90{ 90{
91 return efl_add(TEST_NUMBERWRAPPER_CLASS, efl_main_loop_get(), test_numberwrapper_number_set(efl_added, n)); 91 return efl_add_ref(TEST_NUMBERWRAPPER_CLASS, NULL, test_numberwrapper_number_set(efl_added, n));
92} 92}
93 93
94static 94static
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index d2a3684..f11d670 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -145,7 +145,7 @@ EFL_START_TEST(eio_test_sentry_add_and_remove)
145 _create_directory((void*)filename); 145 _create_directory((void*)filename);
146 146
147 //monitor directory 147 //monitor directory
148 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 148 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
149 fail_if(!eio_sentry_add(sentry, filename)); 149 fail_if(!eio_sentry_add(sentry, filename));
150 150
151 eio_sentry_remove(sentry, filename); 151 eio_sentry_remove(sentry, filename);
@@ -166,7 +166,7 @@ EFL_START_TEST(eio_test_sentry_add_remove_add)
166 _create_directory((void*)filename); 166 _create_directory((void*)filename);
167 167
168 //monitor directory 168 //monitor directory
169 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 169 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
170 fail_if(!eio_sentry_add(sentry, filename)); 170 fail_if(!eio_sentry_add(sentry, filename));
171 eio_sentry_remove(sentry, filename); 171 eio_sentry_remove(sentry, filename);
172 172
@@ -191,7 +191,7 @@ EFL_START_TEST(eio_test_sentry_add_add_remove_remove)
191 _create_directory((void*)filename1); 191 _create_directory((void*)filename1);
192 _create_directory((void*)filename2); 192 _create_directory((void*)filename2);
193 193
194 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 194 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
195 195
196 //monitor directory 196 //monitor directory
197 fail_if(!eio_sentry_add(sentry, filename1)); 197 fail_if(!eio_sentry_add(sentry, filename1));
@@ -221,7 +221,7 @@ EFL_START_TEST(eio_test_sentry_directory_file_created_notify)
221 Eo* sentry; 221 Eo* sentry;
222 222
223 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname); 223 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname);
224 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 224 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
225 225
226 //monitor directory 226 //monitor directory
227 fail_if(!eio_sentry_add(sentry, dirname)); 227 fail_if(!eio_sentry_add(sentry, dirname));
@@ -245,7 +245,7 @@ EFL_START_TEST(eio_test_sentry_directory_file_deleted_notify)
245 245
246 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname); 246 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname);
247 _create_file((void*)filename); 247 _create_file((void*)filename);
248 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 248 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
249 249
250 //monitor directory 250 //monitor directory
251 fail_if(!eio_sentry_add(sentry, dirname)); 251 fail_if(!eio_sentry_add(sentry, dirname));
@@ -269,7 +269,7 @@ EFL_START_TEST(eio_test_sentry_directory_file_modified_notify)
269 269
270 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname); 270 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname);
271 _create_file((void*)filename); 271 _create_file((void*)filename);
272 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 272 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
273 273
274 //monitor directory 274 //monitor directory
275 fail_if(!eio_sentry_add(sentry, dirname)); 275 fail_if(!eio_sentry_add(sentry, dirname));
@@ -294,7 +294,7 @@ EFL_START_TEST(eio_test_sentry_directory_file_closed_notify)
294 294
295 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname); 295 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname);
296 _create_file((void*)filename); 296 _create_file((void*)filename);
297 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 297 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
298 298
299 //monitor directory 299 //monitor directory
300 fail_if(!eio_sentry_add(sentry, dirname)); 300 fail_if(!eio_sentry_add(sentry, dirname));
@@ -316,7 +316,7 @@ EFL_START_TEST(eio_test_sentry_directory_directory_created_notify)
316 Eo *sentry; 316 Eo *sentry;
317 317
318 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname); 318 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname);
319 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 319 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
320 320
321 //monitor directory 321 //monitor directory
322 fail_if(!eio_sentry_add(sentry, dirname)); 322 fail_if(!eio_sentry_add(sentry, dirname));
@@ -340,7 +340,7 @@ EFL_START_TEST(eio_test_sentry_directory_directory_deleted_notify)
340 340
341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname); 341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname);
342 _create_directory((void*)filename); 342 _create_directory((void*)filename);
343 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 343 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
344 344
345 //monitor directory 345 //monitor directory
346 fail_if(!eio_sentry_add(sentry, dirname)); 346 fail_if(!eio_sentry_add(sentry, dirname));
@@ -364,7 +364,7 @@ EFL_START_TEST(eio_test_sentry_directory_directory_modified_notify)
364 364
365 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname); 365 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname);
366 _create_directory((void*)filename); 366 _create_directory((void*)filename);
367 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 367 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
368 368
369 //monitor directory 369 //monitor directory
370 fail_if(!eio_sentry_add(sentry, dirname)); 370 fail_if(!eio_sentry_add(sentry, dirname));
@@ -383,7 +383,7 @@ EFL_END_TEST
383EFL_START_TEST(eio_test_sentry_directory_directory_self_deleted_notify) 383EFL_START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
384{ 384{
385 Eina_Tmpstr *dirname = _common_init(); 385 Eina_Tmpstr *dirname = _common_init();
386 Eo *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 386 Eo *sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
387 387
388 //monitor directory 388 //monitor directory
389 fail_if(!eio_sentry_add(sentry, dirname)); 389 fail_if(!eio_sentry_add(sentry, dirname));
@@ -409,7 +409,7 @@ EFL_START_TEST(eio_test_sentry_file_file_modified_notify)
409 409
410 filename = eina_stringshare_printf("%s/filecreated", dirname); 410 filename = eina_stringshare_printf("%s/filecreated", dirname);
411 _create_file((void*)filename); 411 _create_file((void*)filename);
412 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 412 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
413 413
414 //monitor file 414 //monitor file
415 fail_if(!eio_sentry_add(sentry, filename)); 415 fail_if(!eio_sentry_add(sentry, filename));
@@ -434,7 +434,7 @@ EFL_START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
434 434
435 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname); 435 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname);
436 _create_file((void*)filename); 436 _create_file((void*)filename);
437 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 437 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
438 438
439 //monitor file 439 //monitor file
440 fail_if(!eio_sentry_add(sentry, filename)); 440 fail_if(!eio_sentry_add(sentry, filename));
@@ -459,7 +459,7 @@ EFL_START_TEST(eio_test_sentry_file_file_closed_notify)
459 459
460 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname); 460 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname);
461 _create_file((void*)filename); 461 _create_file((void*)filename);
462 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 462 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
463 463
464 //monitor file 464 //monitor file
465 fail_if(!eio_sentry_add(sentry, dirname)); 465 fail_if(!eio_sentry_add(sentry, dirname));
@@ -482,7 +482,7 @@ EFL_START_TEST(eio_test_sentry_file_file_self_deleted_notify)
482 482
483 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname); 483 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname);
484 _create_file((void*)filename); 484 _create_file((void*)filename);
485 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 485 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
486 486
487 //monitor file 487 //monitor file
488 fail_if(!eio_sentry_add(sentry, filename)); 488 fail_if(!eio_sentry_add(sentry, filename));
@@ -508,7 +508,7 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_event)
508 508
509 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 509 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
510 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname); 510 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname);
511 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 511 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
512 512
513 //monitor directory 513 //monitor directory
514 fail_if(!eio_sentry_add(sentry, dirname)); 514 fail_if(!eio_sentry_add(sentry, dirname));
@@ -537,7 +537,7 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
537 537
538 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 538 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
539 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 539 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
540 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 540 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
541 541
542 //monitor directory 542 //monitor directory
543 fail_if(!eio_sentry_add(sentry, dirname2)); 543 fail_if(!eio_sentry_add(sentry, dirname2));
@@ -571,7 +571,7 @@ EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
571 571
572 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 572 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
573 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 573 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
574 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 574 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
575 575
576 //monitor directory 576 //monitor directory
577 fail_if(!eio_sentry_add(sentry, dirname)); 577 fail_if(!eio_sentry_add(sentry, dirname));
@@ -602,7 +602,7 @@ EFL_START_TEST(eio_test_sentry_two_files_in_same_directory)
602 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname); 602 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname);
603 _create_file((void*)filename); 603 _create_file((void*)filename);
604 _create_file((void*)filename2); 604 _create_file((void*)filename2);
605 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 605 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
606 606
607 //monitor file 607 //monitor file
608 fail_if(!eio_sentry_add(sentry,filename)); 608 fail_if(!eio_sentry_add(sentry,filename));
@@ -632,7 +632,7 @@ EFL_START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
632 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname); 632 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname);
633 _create_file((void*)filename); 633 _create_file((void*)filename);
634 _create_file((void*)filename2); 634 _create_file((void*)filename2);
635 sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 635 sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
636 636
637 //monitor file 637 //monitor file
638 fail_if(!eio_sentry_add(sentry,filename)); 638 fail_if(!eio_sentry_add(sentry,filename));
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 1ff61da..0cb3b72 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -28,7 +28,7 @@ void generate_app(void)
28 28
29EFL_START_TEST (test_efl_access_app_obj_name_get) 29EFL_START_TEST (test_efl_access_app_obj_name_get)
30{ 30{
31 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 31 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
32 32
33 ck_assert(root != NULL); 33 ck_assert(root != NULL);
34 34
@@ -40,7 +40,7 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
40 40
41 ck_assert_str_eq(ret, "Test name"); 41 ck_assert_str_eq(ret, "Test name");
42 42
43 efl_del(root); 43 efl_unref(root);
44} 44}
45EFL_END_TEST 45EFL_END_TEST
46 46
@@ -93,7 +93,7 @@ EFL_END_TEST
93 93
94EFL_START_TEST (test_efl_access_object_role_get) 94EFL_START_TEST (test_efl_access_object_role_get)
95{ 95{
96 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 96 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
97 97
98 Efl_Access_Role role; 98 Efl_Access_Role role;
99 99
@@ -101,7 +101,7 @@ EFL_START_TEST (test_efl_access_object_role_get)
101 101
102 ck_assert(role == EFL_ACCESS_ROLE_APPLICATION); 102 ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
103 103
104 efl_del(root); 104 efl_unref(root);
105} 105}
106EFL_END_TEST 106EFL_END_TEST
107 107
@@ -127,7 +127,7 @@ EFL_END_TEST
127 127
128EFL_START_TEST (test_efl_access_object_role_name_get) 128EFL_START_TEST (test_efl_access_object_role_name_get)
129{ 129{
130 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 130 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
131 131
132 const char *ret = NULL; 132 const char *ret = NULL;
133 133
@@ -135,13 +135,13 @@ EFL_START_TEST (test_efl_access_object_role_name_get)
135 135
136 ck_assert(ret != NULL); 136 ck_assert(ret != NULL);
137 137
138 efl_del(root); 138 efl_unref(root);
139} 139}
140EFL_END_TEST 140EFL_END_TEST
141 141
142EFL_START_TEST (test_efl_access_object_localized_role_name_get) 142EFL_START_TEST (test_efl_access_object_localized_role_name_get)
143{ 143{
144 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 144 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
145 145
146 const char *ret = NULL; 146 const char *ret = NULL;
147 147
@@ -149,13 +149,13 @@ EFL_START_TEST (test_efl_access_object_localized_role_name_get)
149 149
150 ck_assert(ret != NULL); 150 ck_assert(ret != NULL);
151 151
152 efl_del(root); 152 efl_unref(root);
153} 153}
154EFL_END_TEST 154EFL_END_TEST
155 155
156EFL_START_TEST (test_efl_access_object_description_set) 156EFL_START_TEST (test_efl_access_object_description_set)
157{ 157{
158 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 158 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
159 159
160 const char *ret = NULL; 160 const char *ret = NULL;
161 161
@@ -176,7 +176,7 @@ EFL_START_TEST (test_efl_access_object_description_set)
176 176
177 ck_assert(ret == NULL); 177 ck_assert(ret == NULL);
178 178
179 efl_del(root); 179 efl_unref(root);
180} 180}
181EFL_END_TEST 181EFL_END_TEST
182 182
@@ -196,7 +196,7 @@ EFL_END_TEST
196EFL_START_TEST (test_efl_access_children_and_parent) 196EFL_START_TEST (test_efl_access_children_and_parent)
197{ 197{
198 generate_app(); 198 generate_app();
199 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 199 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
200 200
201 Eina_List *child_list = NULL; 201 Eina_List *child_list = NULL;
202 202
@@ -213,14 +213,14 @@ EFL_START_TEST (test_efl_access_children_and_parent)
213 ck_assert_ptr_ne(win, NULL); 213 ck_assert_ptr_ne(win, NULL);
214 ck_assert_ptr_eq(win, g_win); 214 ck_assert_ptr_eq(win, g_win);
215 215
216 efl_del(root); 216 efl_unref(root);
217} 217}
218EFL_END_TEST 218EFL_END_TEST
219 219
220EFL_START_TEST (test_efl_access_children_and_parent2) 220EFL_START_TEST (test_efl_access_children_and_parent2)
221{ 221{
222 generate_app(); 222 generate_app();
223 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 223 Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
224 224
225 Eo *win = NULL; 225 Eo *win = NULL;
226 226
@@ -239,7 +239,7 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
239 ck_assert(btn != NULL); 239 ck_assert(btn != NULL);
240 ck_assert(btn == g_btn); 240 ck_assert(btn == g_btn);
241 241
242 efl_del(root); 242 efl_unref(root);
243} 243}
244EFL_END_TEST 244EFL_END_TEST
245 245
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index 2edab80..777c6c2 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -148,14 +148,14 @@ EFL_START_TEST (elm_config_win)
148 Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE); 148 Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
149 fail_if(!cfg); 149 fail_if(!cfg);
150 150
151 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get()); 151 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL);
152 Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE); 152 Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE);
153 fail_if(cfg != cfg2); 153 fail_if(cfg != cfg2);
154 154
155 elm_config_cache_flush_interval_set(42); 155 elm_config_cache_flush_interval_set(42);
156 fail_if(efl_config_int_get(win, "cache_flush_interval") != 42); 156 fail_if(efl_config_int_get(win, "cache_flush_interval") != 42);
157 157
158 efl_del(win); 158 efl_unref(win);
159} 159}
160EFL_END_TEST 160EFL_END_TEST
161 161
diff --git a/src/tests/elementary/elm_test_focus.c b/src/tests/elementary/elm_test_focus.c
index dfde01d..3ce49d9 100644
--- a/src/tests/elementary/elm_test_focus.c
+++ b/src/tests/elementary/elm_test_focus.c
@@ -2,10 +2,10 @@
2 2
3EFL_START_TEST(focus_unregister_twice) 3EFL_START_TEST(focus_unregister_twice)
4{ 4{
5 Efl_Ui_Focus_Object *r1 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get()); 5 Efl_Ui_Focus_Object *r1 = efl_add_ref(FOCUS_TEST_CLASS, NULL);
6 Efl_Ui_Focus_Object *r2 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get()); 6 Efl_Ui_Focus_Object *r2 = efl_add_ref(FOCUS_TEST_CLASS, NULL);
7 7
8 Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 8 Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
9 efl_ui_focus_manager_root_set(efl_added, r1) 9 efl_ui_focus_manager_root_set(efl_added, r1)
10 ); 10 );
11 11
@@ -15,9 +15,9 @@ EFL_START_TEST(focus_unregister_twice)
15 efl_ui_focus_manager_calc_unregister(m, r1); 15 efl_ui_focus_manager_calc_unregister(m, r1);
16 efl_ui_focus_manager_calc_unregister(m, r1); 16 efl_ui_focus_manager_calc_unregister(m, r1);
17 17
18 efl_del(r2); 18 efl_unref(r2);
19 efl_del(r1); 19 efl_unref(r1);
20 efl_del(m); 20 efl_unref(m);
21 21
22} 22}
23EFL_END_TEST 23EFL_END_TEST
@@ -27,15 +27,15 @@ EFL_START_TEST(focus_register_twice)
27 Efl_Ui_Focus_Object *r1 = elm_focus_test_object_new("r1", 0, 0, 10, 10); 27 Efl_Ui_Focus_Object *r1 = elm_focus_test_object_new("r1", 0, 0, 10, 10);
28 Efl_Ui_Focus_Object *r2 = elm_focus_test_object_new("r2", 0, 10, 10, 10); 28 Efl_Ui_Focus_Object *r2 = elm_focus_test_object_new("r2", 0, 10, 10, 10);
29 29
30 Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 30 Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
31 efl_ui_focus_manager_root_set(efl_added, r1) 31 efl_ui_focus_manager_root_set(efl_added, r1)
32 ); 32 );
33 33
34 fail_if(!efl_ui_focus_manager_calc_register(m, r2, r1, NULL)); 34 fail_if(!efl_ui_focus_manager_calc_register(m, r2, r1, NULL));
35 fail_if(efl_ui_focus_manager_calc_register(m, r2, r1, NULL)); 35 fail_if(efl_ui_focus_manager_calc_register(m, r2, r1, NULL));
36 36
37 efl_del(r1); 37 efl_unref(r1);
38 efl_del(m); 38 efl_unref(m);
39 39
40} 40}
41EFL_END_TEST 41EFL_END_TEST
@@ -71,13 +71,12 @@ EFL_START_TEST(pos_check)
71 CHECK(north, east, west, NULL, middle) 71 CHECK(north, east, west, NULL, middle)
72 CHECK(south, east, west, middle, NULL) 72 CHECK(south, east, west, middle, NULL)
73 73
74 efl_del(middle); 74 efl_unref(middle);
75 efl_del(south); 75 efl_unref(south);
76 efl_del(north); 76 efl_unref(north);
77 efl_del(east); 77 efl_unref(east);
78 efl_del(west); 78 efl_unref(west);
79 efl_del(m); 79 efl_unref(m);
80
81} 80}
82EFL_END_TEST 81EFL_END_TEST
83 82
@@ -142,11 +141,11 @@ EFL_START_TEST(pos_check2)
142 141
143#undef ck_assert_set_eq 142#undef ck_assert_set_eq
144 143
145 efl_del(middle); 144 efl_unref(middle);
146 efl_del(north_east); 145 efl_unref(north_east);
147 efl_del(north_west); 146 efl_unref(north_west);
148 efl_del(south_east); 147 efl_unref(south_east);
149 efl_del(south_west); 148 efl_unref(south_west);
150 149
151} 150}
152EFL_END_TEST 151EFL_END_TEST
@@ -157,11 +156,11 @@ EFL_START_TEST(redirect)
157 TEST_OBJ_NEW(one, 0, 0, 20, 20); 156 TEST_OBJ_NEW(one, 0, 0, 20, 20);
158 TEST_OBJ_NEW(two, 20, 0, 20, 20); 157 TEST_OBJ_NEW(two, 20, 0, 20, 20);
159 158
160 Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 159 Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
161 efl_ui_focus_manager_root_set(efl_added, root) 160 efl_ui_focus_manager_root_set(efl_added, root)
162 ); 161 );
163 162
164 Efl_Ui_Focus_Manager *m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 163 Efl_Ui_Focus_Manager *m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
165 efl_ui_focus_manager_root_set(efl_added, root2) 164 efl_ui_focus_manager_root_set(efl_added, root2)
166 ); 165 );
167 166
@@ -173,8 +172,8 @@ EFL_START_TEST(redirect)
173 172
174 ck_assert_ptr_eq(efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_RIGHT), two); 173 ck_assert_ptr_eq(efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_RIGHT), two);
175 174
176 efl_del(m); 175 efl_unref(m);
177 efl_del(m2); 176 efl_unref(m2);
178} 177}
179EFL_END_TEST 178EFL_END_TEST
180 179
@@ -350,8 +349,8 @@ EFL_START_TEST(logical_chain_multi_redirect)
350 349
351 _check_chain(m, objects); 350 _check_chain(m, objects);
352 351
353 efl_del(m2); 352 efl_unref(m2);
354 efl_del(m); 353 efl_unref(m);
355} 354}
356EFL_END_TEST 355EFL_END_TEST
357 356
@@ -382,8 +381,8 @@ EFL_START_TEST(logical_chain_single_redirect)
382 381
383 _check_chain(m, objects); 382 _check_chain(m, objects);
384 383
385 efl_del(m2); 384 efl_unref(m2);
386 efl_del(m); 385 efl_unref(m);
387} 386}
388EFL_END_TEST 387EFL_END_TEST
389 388
@@ -391,10 +390,10 @@ EFL_START_TEST(finalize_check)
391{ 390{
392 Efl_Ui_Focus_Manager *m; 391 Efl_Ui_Focus_Manager *m;
393 392
394 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get()); 393 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL);
395 fail_if(m); 394 fail_if(m);
396 395
397 efl_del(m); 396 efl_unref(m);
398} 397}
399EFL_END_TEST 398EFL_END_TEST
400 399
@@ -406,11 +405,11 @@ EFL_START_TEST(redirect_param)
406 TEST_OBJ_NEW(root2, 0, 20, 20, 20); 405 TEST_OBJ_NEW(root2, 0, 20, 20, 20);
407 TEST_OBJ_NEW(child, 0, 20, 20, 20); 406 TEST_OBJ_NEW(child, 0, 20, 20, 20);
408 407
409 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 408 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
410 efl_ui_focus_manager_root_set(efl_added, root) 409 efl_ui_focus_manager_root_set(efl_added, root)
411 ); 410 );
412 411
413 m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 412 m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
414 efl_ui_focus_manager_root_set(efl_added, root2) 413 efl_ui_focus_manager_root_set(efl_added, root2)
415 ); 414 );
416 415
@@ -419,8 +418,8 @@ EFL_START_TEST(redirect_param)
419 418
420 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2); 419 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2);
421 420
422 efl_del(m); 421 efl_unref(m);
423 efl_del(m2); 422 efl_unref(m2);
424} 423}
425EFL_END_TEST 424EFL_END_TEST
426 425
@@ -432,7 +431,7 @@ EFL_START_TEST(invalid_args_check)
432 TEST_OBJ_NEW(child, 0, 20, 20, 20); 431 TEST_OBJ_NEW(child, 0, 20, 20, 20);
433 TEST_OBJ_NEW(child2, 0, 20, 20, 20); 432 TEST_OBJ_NEW(child2, 0, 20, 20, 20);
434 433
435 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 434 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
436 efl_ui_focus_manager_root_set(efl_added, root) 435 efl_ui_focus_manager_root_set(efl_added, root)
437 ); 436 );
438 437
@@ -450,7 +449,7 @@ EFL_START_TEST(invalid_args_check)
450 ck_assert_int_eq(efl_ui_focus_manager_calc_register(m, child2, root, NULL), 1); 449 ck_assert_int_eq(efl_ui_focus_manager_calc_register(m, child2, root, NULL), 1);
451 ck_assert_int_eq(efl_ui_focus_manager_calc_update_parent(m, child, child2), 1); 450 ck_assert_int_eq(efl_ui_focus_manager_calc_update_parent(m, child, child2), 1);
452 451
453 efl_del(m); 452 efl_unref(m);
454} 453}
455EFL_END_TEST 454EFL_END_TEST
456 455
@@ -464,7 +463,7 @@ EFL_START_TEST(order_check)
464 TEST_OBJ_NEW(child2, 0, 20, 20, 20); 463 TEST_OBJ_NEW(child2, 0, 20, 20, 20);
465 TEST_OBJ_NEW(child3, 0, 20, 20, 20); 464 TEST_OBJ_NEW(child3, 0, 20, 20, 20);
466 465
467 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 466 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
468 efl_ui_focus_manager_root_set(efl_added, root) 467 efl_ui_focus_manager_root_set(efl_added, root)
469 ); 468 );
470 469
@@ -486,7 +485,7 @@ EFL_START_TEST(order_check)
486 order = eina_list_append(order, child2); 485 order = eina_list_append(order, child2);
487 ck_assert_int_eq(efl_ui_focus_manager_calc_update_children(m, root, order), 0); 486 ck_assert_int_eq(efl_ui_focus_manager_calc_update_children(m, root, order), 0);
488 487
489 efl_del(m); 488 efl_unref(m);
490} 489}
491EFL_END_TEST 490EFL_END_TEST
492 491
@@ -500,7 +499,7 @@ EFL_START_TEST(logical_shift)
500 TEST_OBJ_NEW(sub_sub, 0, 0, 10, 10); 499 TEST_OBJ_NEW(sub_sub, 0, 0, 10, 10);
501 TEST_OBJ_NEW(sub_child, 0, 0, 10, 10); 500 TEST_OBJ_NEW(sub_child, 0, 0, 10, 10);
502 501
503 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 502 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
504 efl_ui_focus_manager_root_set(efl_added, root) 503 efl_ui_focus_manager_root_set(efl_added, root)
505 ); 504 );
506 505
@@ -518,7 +517,7 @@ EFL_START_TEST(logical_shift)
518 efl_ui_focus_manager_focus_set(m, sub_sub); 517 efl_ui_focus_manager_focus_set(m, sub_sub);
519 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), sub_child); 518 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), sub_child);
520 519
521 efl_del(m); 520 efl_unref(m);
522} 521}
523EFL_END_TEST 522EFL_END_TEST
524 523
@@ -530,13 +529,13 @@ EFL_START_TEST(root_redirect_chain)
530 TEST_OBJ_NEW(root2, 0, 20, 20, 20); 529 TEST_OBJ_NEW(root2, 0, 20, 20, 20);
531 TEST_OBJ_NEW(child, 0, 20, 20, 20); 530 TEST_OBJ_NEW(child, 0, 20, 20, 20);
532 531
533 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 532 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
534 efl_ui_focus_manager_root_set(efl_added, root) 533 efl_ui_focus_manager_root_set(efl_added, root)
535 ); 534 );
536 535
537 focus_test_manager_set(root2, m); 536 focus_test_manager_set(root2, m);
538 537
539 m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 538 m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
540 efl_ui_focus_manager_root_set(efl_added, root2) 539 efl_ui_focus_manager_root_set(efl_added, root2)
541 ); 540 );
542 541
@@ -546,8 +545,8 @@ EFL_START_TEST(root_redirect_chain)
546 545
547 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2); 546 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2);
548 547
549 efl_del(m); 548 efl_unref(m);
550 efl_del(m2); 549 efl_unref(m2);
551} 550}
552EFL_END_TEST 551EFL_END_TEST
553 552
@@ -559,21 +558,21 @@ EFL_START_TEST(root_redirect_chain_unset)
559 TEST_OBJ_NEW(root2, 0, 20, 20, 20); 558 TEST_OBJ_NEW(root2, 0, 20, 20, 20);
560 TEST_OBJ_NEW(child, 0, 20, 20, 20); 559 TEST_OBJ_NEW(child, 0, 20, 20, 20);
561 560
562 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 561 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
563 efl_ui_focus_manager_root_set(efl_added, root) 562 efl_ui_focus_manager_root_set(efl_added, root)
564 ); 563 );
565 564
566 focus_test_manager_set(root2, m); 565 focus_test_manager_set(root2, m);
567 566
568 m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 567 m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
569 efl_ui_focus_manager_root_set(efl_added, root2) 568 efl_ui_focus_manager_root_set(efl_added, root2)
570 ); 569 );
571 570
572 m3 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 571 m3 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
573 efl_ui_focus_manager_root_set(efl_added, root2) 572 efl_ui_focus_manager_root_set(efl_added, root2)
574 ); 573 );
575 574
576 m4 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 575 m4 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
577 efl_ui_focus_manager_root_set(efl_added, root2) 576 efl_ui_focus_manager_root_set(efl_added, root2)
578 ); 577 );
579 578
@@ -590,10 +589,10 @@ EFL_START_TEST(root_redirect_chain_unset)
590 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m3), NULL); 589 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m3), NULL);
591 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m4), NULL); 590 ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m4), NULL);
592 591
593 efl_del(m); 592 efl_unref(m);
594 efl_del(m2); 593 efl_unref(m2);
595 efl_del(m3); 594 efl_unref(m3);
596 efl_del(m4); 595 efl_unref(m4);
597} 596}
598EFL_END_TEST 597EFL_END_TEST
599 598
@@ -606,7 +605,7 @@ _recursive_triangle_manager(int recusion_depth, Efl_Ui_Focus_Object **most_right
606 TEST_OBJ_NEW(root, 0, 20, 20, 20); 605 TEST_OBJ_NEW(root, 0, 20, 20, 20);
607 TEST_OBJ_NEW(child2, 0, 20, 20, 20); 606 TEST_OBJ_NEW(child2, 0, 20, 20, 20);
608 607
609 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 608 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
610 efl_ui_focus_manager_root_set(efl_added, root) 609 efl_ui_focus_manager_root_set(efl_added, root)
611 ); 610 );
612 611
@@ -688,8 +687,7 @@ EFL_START_TEST(first_touch_check)
688 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(_get_highest_redirect(m)), most_right); 687 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(_get_highest_redirect(m)), most_right);
689 688
690 EINA_LIST_FREE(managers, m) 689 EINA_LIST_FREE(managers, m)
691 efl_del(m); 690 efl_unref(m);
692
693} 691}
694EFL_END_TEST 692EFL_END_TEST
695 693
@@ -702,7 +700,7 @@ EFL_START_TEST(test_request_subchild_empty)
702 700
703 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, root), NULL); 701 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, root), NULL);
704 702
705 efl_del(m); 703 efl_unref(m);
706} 704}
707EFL_END_TEST 705EFL_END_TEST
708 706
@@ -718,7 +716,7 @@ EFL_START_TEST(test_request_subchild_one_element)
718 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, root), c1); 716 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, root), c1);
719 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), NULL); 717 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), NULL);
720 718
721 efl_del(m); 719 efl_unref(m);
722} 720}
723EFL_END_TEST 721EFL_END_TEST
724 722
@@ -737,7 +735,7 @@ EFL_START_TEST(test_request_subchild_child_alongside)
737 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), NULL); 735 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), NULL);
738 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL); 736 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
739 737
740 efl_del(m); 738 efl_unref(m);
741} 739}
742EFL_END_TEST 740EFL_END_TEST
743 741
@@ -756,7 +754,7 @@ EFL_START_TEST(test_request_subchild_child_logical_regular)
756 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), c2); 754 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), c2);
757 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL); 755 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
758 756
759 efl_del(m); 757 efl_unref(m);
760} 758}
761EFL_END_TEST 759EFL_END_TEST
762 760
@@ -775,7 +773,7 @@ EFL_START_TEST(test_request_subchild_child_regular_regular)
775 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), c2); 773 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), c2);
776 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL); 774 ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
777 775
778 efl_del(m); 776 efl_unref(m);
779} 777}
780EFL_END_TEST 778EFL_END_TEST
781 779
@@ -798,7 +796,7 @@ EFL_START_TEST(test_unregister_last_focused_no_history)
798 efl_ui_focus_manager_calc_unregister(m, c2); 796 efl_ui_focus_manager_calc_unregister(m, c2);
799 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c1); 797 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c1);
800 798
801 efl_del(m); 799 efl_unref(m);
802} 800}
803EFL_END_TEST 801EFL_END_TEST
804 802
@@ -823,7 +821,7 @@ EFL_START_TEST(test_unregister_last_focused)
823 efl_ui_focus_manager_calc_unregister(m, c3); 821 efl_ui_focus_manager_calc_unregister(m, c3);
824 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c2); 822 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c2);
825 823
826 efl_del(m); 824 efl_unref(m);
827} 825}
828EFL_END_TEST 826EFL_END_TEST
829 827
@@ -841,7 +839,7 @@ EFL_START_TEST(test_unregister_last_focused_no_child)
841 efl_ui_focus_manager_calc_unregister(m, c1); 839 efl_ui_focus_manager_calc_unregister(m, c1);
842 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), NULL); 840 ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), NULL);
843 841
844 efl_del(m); 842 efl_unref(m);
845} 843}
846EFL_END_TEST 844EFL_END_TEST
847 845
@@ -875,7 +873,7 @@ EFL_START_TEST(test_pop_history_element)
875 ck_assert_int_eq(efl_ui_focus_object_focus_get(c2), EINA_FALSE); 873 ck_assert_int_eq(efl_ui_focus_object_focus_get(c2), EINA_FALSE);
876 ck_assert_int_eq(efl_ui_focus_object_focus_get(c1), EINA_TRUE); 874 ck_assert_int_eq(efl_ui_focus_object_focus_get(c1), EINA_TRUE);
877 875
878 efl_del(m); 876 efl_unref(m);
879} 877}
880EFL_END_TEST 878EFL_END_TEST
881 879
diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c
index 3ecbd4f..63ee2dc 100644
--- a/src/tests/elementary/elm_test_focus_common.c
+++ b/src/tests/elementary/elm_test_focus_common.c
@@ -17,7 +17,7 @@ elm_focus_test_object_new(const char *name, int x, int y, int w, int h)
17{ 17{
18 Efl_Ui_Focus_Object *ret; 18 Efl_Ui_Focus_Object *ret;
19 19
20 ret = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get(), 20 ret = efl_add_ref(FOCUS_TEST_CLASS, NULL,
21 efl_name_set(efl_added, name) 21 efl_name_set(efl_added, name)
22 ); 22 );
23 Q(ret, x, y, w, h); 23 Q(ret, x, y, w, h);
@@ -48,7 +48,7 @@ elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle)
48 Efl_Ui_Focus_Manager *m; 48 Efl_Ui_Focus_Manager *m;
49 49
50 root = elm_focus_test_object_new("middle", 40, 40, 20, 20); 50 root = elm_focus_test_object_new("middle", 40, 40, 20, 20);
51 m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 51 m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
52 efl_ui_focus_manager_root_set(efl_added, root) 52 efl_ui_focus_manager_root_set(efl_added, root)
53 ); 53 );
54 if (middle) 54 if (middle)
diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c
index 98a809b..3f100df 100644
--- a/src/tests/elementary/elm_test_focus_sub.c
+++ b/src/tests/elementary/elm_test_focus_sub.c
@@ -75,7 +75,7 @@ _setup(Efl_Ui_Focus_Manager **m, Efl_Ui_Focus_Manager_Sub **sub, Efl_Ui_Focus_Ob
75 EFL_OBJECT_OP_FUNC(efl_ui_focus_manager_calc_unregister, _unregister), 75 EFL_OBJECT_OP_FUNC(efl_ui_focus_manager_calc_unregister, _unregister),
76 ); 76 );
77 77
78 Efl_Ui_Focus_Manager *manager = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(), 78 Efl_Ui_Focus_Manager *manager = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
79 efl_ui_focus_manager_root_set(efl_added, root_manager) 79 efl_ui_focus_manager_root_set(efl_added, root_manager)
80 ); 80 );
81 //flush now all changes 81 //flush now all changes
@@ -85,7 +85,7 @@ _setup(Efl_Ui_Focus_Manager **m, Efl_Ui_Focus_Manager_Sub **sub, Efl_Ui_Focus_Ob
85 85
86 efl_object_override(manager, &manager_tracker); 86 efl_object_override(manager, &manager_tracker);
87 87
88 Focus_Test_Sub_Main *focus_main = efl_add(FOCUS_TEST_SUB_MAIN_CLASS, efl_main_loop_get()); 88 Focus_Test_Sub_Main *focus_main = efl_add_ref(FOCUS_TEST_SUB_MAIN_CLASS, NULL);
89 89
90 efl_key_data_set(focus_main, "__user_manager", manager); 90 efl_key_data_set(focus_main, "__user_manager", manager);
91 efl_key_data_set(focus_main, "__user_parent", root_manager); 91 efl_key_data_set(focus_main, "__user_parent", root_manager);
@@ -134,11 +134,11 @@ EFL_START_TEST(correct_register)
134 efl_ui_focus_manager_calc_unregister(sub, child1); 134 efl_ui_focus_manager_calc_unregister(sub, child1);
135 efl_ui_focus_manager_calc_unregister(sub, child2); 135 efl_ui_focus_manager_calc_unregister(sub, child2);
136 efl_ui_focus_manager_calc_unregister(sub, child3); 136 efl_ui_focus_manager_calc_unregister(sub, child3);
137 efl_del(child1); 137 efl_unref(child1);
138 efl_del(child2); 138 efl_unref(child2);
139 efl_del(child3); 139 efl_unref(child3);
140 efl_del(sub); 140 efl_unref(sub);
141 efl_del(manager); 141 efl_unref(manager);
142} 142}
143EFL_END_TEST 143EFL_END_TEST
144 144
@@ -173,12 +173,12 @@ EFL_START_TEST(correct_unregister)
173 eina_list_free(unregistered); 173 eina_list_free(unregistered);
174 unregistered = NULL; 174 unregistered = NULL;
175 175
176 efl_del(sub); 176 efl_unref(sub);
177 efl_del(manager); 177 efl_unref(manager);
178 efl_del(root); 178 efl_unref(root);
179 efl_del(child1); 179 efl_unref(child1);
180 efl_del(child2); 180 efl_unref(child2);
181 efl_del(child3); 181 efl_unref(child3);
182} 182}
183EFL_END_TEST 183EFL_END_TEST
184 184
@@ -211,12 +211,12 @@ EFL_START_TEST(correct_un_register)
211 fail_if(!_set_equal(registered, set_add)); 211 fail_if(!_set_equal(registered, set_add));
212 fail_if(!_set_equal(unregistered, set_del)); 212 fail_if(!_set_equal(unregistered, set_del));
213 213
214 efl_del(sub); 214 efl_unref(sub);
215 efl_del(manager); 215 efl_unref(manager);
216 efl_del(root); 216 efl_unref(root);
217 efl_del(child1); 217 efl_unref(child1);
218 efl_del(child2); 218 efl_unref(child2);
219 efl_del(child3); 219 efl_unref(child3);
220} 220}
221EFL_END_TEST 221EFL_END_TEST
222 222