summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/elementary/test_application_server.c2
-rw-r--r--src/bin/elementary/test_task_switcher.c2
-rw-r--r--src/bin/elementary/test_ui_grid.c2
-rw-r--r--src/bin/elementary/test_win_plug.c2
-rw-r--r--src/examples/ecore/ecore_audio_playback.c2
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c14
-rw-r--r--src/examples/elementary/performance/graphical.c4
-rw-r--r--src/lib/ecore/ecore.c4
-rw-r--r--src/lib/ecore/ecore_exe.c2
-rw-r--r--src/lib/ecore/ecore_main.c4
-rw-r--r--src/lib/ecore/ecore_timer.c8
-rw-r--r--src/lib/ecore_con/ecore_con.c8
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c2
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c2
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/edje/edje_edit.c4
-rw-r--r--src/lib/edje/edje_load.c4
-rw-r--r--src/lib/edje/edje_multisense.c12
-rw-r--r--src/lib/edje/edje_smart.c6
-rw-r--r--src/lib/elementary/elc_ctxpopup.c2
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elm_app_client.c6
-rw-r--r--src/lib/elementary/elm_app_server.c4
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_dayselector.c8
-rw-r--r--src/lib/elementary/elm_diskselector.c18
-rw-r--r--src/lib/elementary/elm_gengrid.c4
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_list.c6
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_segment_control.c2
-rw-r--r--src/lib/elementary/elm_slideshow.c2
-rw-r--r--src/lib/elementary/elm_sys_notify.c4
-rw-r--r--src/lib/elementary/elm_widget.c2
-rw-r--r--src/lib/eo/Eo.h1
-rw-r--r--src/lib/eo/eo.c4
-rw-r--r--src/lib/eo/eo_base.eo9
-rw-r--r--src/lib/eo/eo_base_class.c15
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c6
-rw-r--r--src/lib/evas/filters/evas_filter.c2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c28
-rw-r--r--src/tests/edje/edje_test_edje.c6
-rw-r--r--src/tests/elementary/elm_test_atspi.c2
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c2
-rw-r--r--src/tests/eo/children/children_main.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c21
-rw-r--r--src/tests/evas/evas_test_image.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c4
57 files changed, 132 insertions, 156 deletions
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index d05d74e3ea..9f98b1ed3a 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -45,7 +45,7 @@ _close_cb(void *data, const Eo_Event *event)
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
47 evas_object_del(ctx->win); 47 evas_object_del(ctx->win);
48 eo_del(event->obj); 48 eo_unref(event->obj);
49 return EINA_TRUE; 49 return EINA_TRUE;
50} 50}
51 51
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index fae686edef..0440a74947 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -283,7 +283,7 @@ _win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_
283{ 283{
284 Elm_App_Client *app; 284 Elm_App_Client *app;
285 EINA_LIST_FREE(apps_list, app) 285 EINA_LIST_FREE(apps_list, app)
286 eo_del(app); 286 eo_unref(app);
287} 287}
288 288
289static void 289static void
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index fbd85e41ac..95359d057b 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -502,7 +502,7 @@ static void
502remove_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 502remove_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
503{ 503{
504 //efl_pack_unpack(data, obj); 504 //efl_pack_unpack(data, obj);
505 eo_del(obj); 505 eo_unref(obj);
506} 506}
507 507
508static void 508static void
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 3e4226d47b..5c627074b1 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -146,7 +146,7 @@ create_handles(Evas_Object *obj)
146static Eina_Bool 146static Eina_Bool
147_notify_end(void *data EINA_UNUSED, const Eo_Event *event) 147_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
148{ 148{
149 eo_del(event->obj); 149 eo_unref(event->obj);
150 return EINA_FALSE; 150 return EINA_FALSE;
151} 151}
152 152
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index f1624e0e67..9beb4e3b94 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -201,7 +201,7 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
201 201
202 inputs = eina_list_remove(inputs, event->obj); 202 inputs = eina_list_remove(inputs, event->obj);
203 ret = ecore_audio_obj_out_input_detach(out, event->obj); 203 ret = ecore_audio_obj_out_input_detach(out, event->obj);
204 eo_del(event->obj); 204 eo_unref(event->obj);
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);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index fceed59045..2296be2e09 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -24,8 +24,8 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
24 printf("Done: %s\n", name); 24 printf("Done: %s\n", name);
25 25
26 ecore_audio_obj_in_output_get(event->obj, &out); 26 ecore_audio_obj_in_output_get(event->obj, &out);
27 eo_del(event->obj); 27 eo_unref(event->obj);
28 eo_del(out); 28 eo_unref(out);
29 29
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
31 31
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
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 eo_del(in); 57 eo_unref(in);
58 return 1; 58 return 1;
59 } 59 }
60 60
@@ -64,16 +64,16 @@ main(int argc, char *argv[])
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 eo_del(in); 67 eo_unref(in);
68 eo_del(out); 68 eo_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 eo_del(out); 75 eo_unref(out);
76 eo_del(in); 76 eo_unref(in);
77 return 1; 77 return 1;
78 } 78 }
79 79
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 239655e0ef..b364022b2d 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -289,7 +289,7 @@ _change_scene_setup()
289 { 289 {
290 evas_canvas3d_node_member_del(globalGraphical.root_node, node); 290 evas_canvas3d_node_member_del(globalGraphical.root_node, node);
291 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node); 291 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
292 /*eo_del(node);Unless evas_canvas3d_destructors work properly*/ 292 /*eo_unref(node);Unless evas_canvas3d_destructors work properly*/
293 } 293 }
294 eina_list_free(globalGraphical.list_nodes); 294 eina_list_free(globalGraphical.list_nodes);
295 eina_list_free(l); 295 eina_list_free(l);
@@ -298,7 +298,7 @@ _change_scene_setup()
298 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m) 298 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m)
299 { 299 {
300 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m); 300 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m);
301 /*eo_del(m); Unless evas_canvas3d_destructors work properly*/ 301 /*eo_unref(m); Unless evas_canvas3d_destructors work properly*/
302 } 302 }
303 eina_list_free(globalGraphical.list_meshes); 303 eina_list_free(globalGraphical.list_meshes);
304 eina_list_free(l); 304 eina_list_free(l);
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 6c533335be..da0dfda91b 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -367,7 +367,7 @@ ecore_shutdown(void)
367 } 367 }
368#endif 368#endif
369 369
370 eo_del(_mainloop_singleton); 370 eo_unref(_mainloop_singleton);
371 _mainloop_singleton = NULL; 371 _mainloop_singleton = NULL;
372 372
373 if (_ecore_fps_debug) _ecore_fps_debug_shutdown(); 373 if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
@@ -413,7 +413,7 @@ ecore_shutdown(void)
413 413
414 if (vpath) 414 if (vpath)
415 { 415 {
416 eo_del(vpath); 416 eo_unref(vpath);
417 vpath = NULL; 417 vpath = NULL;
418 } 418 }
419 419
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index 3063b79685..941eb72293 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -209,7 +209,7 @@ ecore_exe_free(Ecore_Exe *obj)
209 return NULL; 209 return NULL;
210 210
211 void *data = exe->data; 211 void *data = exe->data;
212 eo_del(obj); 212 eo_unref(obj);
213 213
214 return data; 214 return data;
215} 215}
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 760a187a96..2415f2a873 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2833,7 +2833,7 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
2833 2833
2834 eina_promise_owner_value_set(t->promise, &t->data, NULL); 2834 eina_promise_owner_value_set(t->promise, &t->data, NULL);
2835 2835
2836 eo_del(t->u.timer); 2836 eo_unref(t->u.timer);
2837 2837
2838 return EO_CALLBACK_CONTINUE; 2838 return EO_CALLBACK_CONTINUE;
2839} 2839}
@@ -2853,7 +2853,7 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner* promise EINA_UNUSED)
2853 if (j->job_is) 2853 if (j->job_is)
2854 ecore_job_del(j->u.job); 2854 ecore_job_del(j->u.job);
2855 else 2855 else
2856 eo_del(j->u.timer); 2856 eo_unref(j->u.timer);
2857 _efl_loop_internal_cancel(j); 2857 _efl_loop_internal_cancel(j);
2858} 2858}
2859 2859
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 5be10520ea..d8dd17930f 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -172,7 +172,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
172 legacy->inside_call = 1; 172 legacy->inside_call = 1;
173 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) || 173 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
174 legacy->delete_me) 174 legacy->delete_me)
175 eo_del(event->obj); 175 eo_unref(event->obj);
176 176
177 return EO_CALLBACK_CONTINUE; 177 return EO_CALLBACK_CONTINUE;
178} 178}
@@ -239,7 +239,7 @@ ecore_timer_del(Ecore_Timer *timer)
239 if (legacy->inside_call) 239 if (legacy->inside_call)
240 legacy->delete_me = EINA_TRUE; 240 legacy->delete_me = EINA_TRUE;
241 else 241 else
242 eo_del(timer); 242 eo_unref(timer);
243 243
244 return data; 244 return data;
245} 245}
@@ -484,10 +484,10 @@ _efl_timer_shutdown(void)
484 Efl_Timer_Data *timer; 484 Efl_Timer_Data *timer;
485 485
486 EINA_INLIST_FREE(timers, timer) 486 EINA_INLIST_FREE(timers, timer)
487 eo_del(timer->object); 487 eo_unref(timer->object);
488 488
489 EINA_INLIST_FREE(suspended, timer) 489 EINA_INLIST_FREE(suspended, timer)
490 eo_del(timer->object); 490 eo_unref(timer->object);
491 491
492 timer_current = NULL; 492 timer_current = NULL;
493} 493}
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 7faf36dd9f..2dc0d57e5c 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -332,7 +332,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
332 return EINA_TRUE; 332 return EINA_TRUE;
333 333
334 free(lk); 334 free(lk);
335 eo_del(obj); 335 eo_unref(obj);
336 return EINA_FALSE; 336 return EINA_FALSE;
337} 337}
338 338
@@ -1293,7 +1293,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1293static void 1293static void
1294_ecore_con_server_free(Ecore_Con_Server *obj) 1294_ecore_con_server_free(Ecore_Con_Server *obj)
1295{ 1295{
1296 eo_del(obj); 1296 eo_unref(obj);
1297} 1297}
1298 1298
1299EOLIAN static void 1299EOLIAN static void
@@ -1381,7 +1381,7 @@ end:
1381static void 1381static void
1382_ecore_con_client_free(Ecore_Con_Client *obj) 1382_ecore_con_client_free(Ecore_Con_Client *obj)
1383{ 1383{
1384 eo_del(obj); 1384 eo_unref(obj);
1385} 1385}
1386 1386
1387EOLIAN static void 1387EOLIAN static void
@@ -2130,7 +2130,7 @@ error:
2130 ecore_event_del(ev); 2130 ecore_event_del(ev);
2131 } 2131 }
2132 } 2132 }
2133 eo_del(obj); 2133 eo_unref(obj);
2134 if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno)); 2134 if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno));
2135 return ECORE_CALLBACK_RENEW; 2135 return ECORE_CALLBACK_RENEW;
2136} 2136}
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 4812d577ba..29cc8b7ce6 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -742,7 +742,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
742EAPI void 742EAPI void
743ecore_con_eet_server_free(Ecore_Con_Eet *r) 743ecore_con_eet_server_free(Ecore_Con_Eet *r)
744{ 744{
745 eo_del(r); 745 eo_unref(r);
746} 746}
747 747
748EAPI void 748EAPI void
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 75d71c0bf9..1c70a41ffc 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -356,7 +356,7 @@ del_handler_read:
356close_event_read: 356close_event_read:
357 CloseHandle(svr->event_read); 357 CloseHandle(svr->event_read);
358free_cl: 358free_cl:
359 eo_del(cl_obj); 359 eo_unref(cl_obj);
360 360
361 return ECORE_CALLBACK_CANCEL; 361 return ECORE_CALLBACK_CANCEL;
362} 362}
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 507770fcf0..c6cb069e8a 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -374,7 +374,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
374 374
375 eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL); 375 eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
376 376
377 eo_del(url_obj); 377 eo_unref(url_obj);
378} 378}
379 379
380static void 380static void
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 0fdd1a1230..9086babc6a 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -200,14 +200,14 @@ _edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const ch
200 int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, group); 200 int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, group);
201 if (!int_ret) 201 if (!int_ret)
202 { 202 {
203 eo_del(file_obj); 203 eo_unref(file_obj);
204 return ret; 204 return ret;
205 } 205 }
206 206
207 eed->program_scripts = eina_hash_int32_new((Eina_Free_Cb)_edje_edit_program_script_free); 207 eed->program_scripts = eina_hash_int32_new((Eina_Free_Cb)_edje_edit_program_script_free);
208 208
209 ef = eet_open(file, EET_FILE_MODE_READ); 209 ef = eet_open(file, EET_FILE_MODE_READ);
210 eo_del(file_obj); 210 eo_unref(file_obj);
211 211
212 snprintf(buf, sizeof(buf), "edje/scripts/embryo/source/%i", 212 snprintf(buf, sizeof(buf), "edje/scripts/embryo/source/%i",
213 eed->base->collection->id); 213 eed->base->collection->id);
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 047e5de9f4..cacf058bdb 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -257,7 +257,7 @@ edje_file_collection_list(const char *file)
257 lst = edje_mmap_collection_list(f); 257 lst = edje_mmap_collection_list(f);
258 258
259 eina_file_close(f); 259 eina_file_close(f);
260 eo_del(file_obj); 260 eo_unref(file_obj);
261 return lst; 261 return lst;
262} 262}
263 263
@@ -1596,7 +1596,7 @@ _edje_file_del(Edje *ed)
1596 _edje_box_layout_free_data(rp->typedata.container->anim); 1596 _edje_box_layout_free_data(rp->typedata.container->anim);
1597 rp->typedata.container->anim = NULL; 1597 rp->typedata.container->anim = NULL;
1598 } 1598 }
1599 eo_del(rp->typedata.container->eo_proxy); 1599 eo_unref(rp->typedata.container->eo_proxy);
1600 free(rp->typedata.container); 1600 free(rp->typedata.container);
1601 } 1601 }
1602 else if ((rp->type == EDJE_RP_TYPE_TEXT) && 1602 else if ((rp->type == EDJE_RP_TYPE_TEXT) &&
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index a43dad8854..d4d9090659 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -10,7 +10,7 @@ static Eina_Bool outfail = EINA_FALSE;
10static Eina_Bool 10static Eina_Bool
11_play_finished(void *data EINA_UNUSED, const Eo_Event *event) 11_play_finished(void *data EINA_UNUSED, const Eo_Event *event)
12{ 12{
13 eo_del(event->obj); 13 eo_unref(event->obj);
14 14
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
@@ -19,7 +19,7 @@ static Eina_Bool
19_out_fail(void *data EINA_UNUSED, const Eo_Event *event) 19_out_fail(void *data EINA_UNUSED, const Eo_Event *event)
20{ 20{
21 outfail = EINA_TRUE; 21 outfail = EINA_TRUE;
22 eo_del(event->obj); 22 eo_unref(event->obj);
23 out = NULL; 23 out = NULL;
24 return EINA_TRUE; 24 return EINA_TRUE;
25} 25}
@@ -219,14 +219,14 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
219#elif HAVE_PULSE 219#elif HAVE_PULSE
220 ERR("Could not create multisense audio out (pulse)"); 220 ERR("Could not create multisense audio out (pulse)");
221#endif 221#endif
222 eo_del(in); 222 eo_unref(in);
223 return EINA_FALSE; 223 return EINA_FALSE;
224 } 224 }
225 ret = ecore_audio_obj_out_input_attach(out, in); 225 ret = ecore_audio_obj_out_input_attach(out, in);
226 if (!ret) 226 if (!ret)
227 { 227 {
228 ERR("Could not attach input"); 228 ERR("Could not attach input");
229 eo_del(in); 229 eo_unref(in);
230 return EINA_FALSE; 230 return EINA_FALSE;
231 } 231 }
232 } 232 }
@@ -289,7 +289,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
289 if (!ret) 289 if (!ret)
290 { 290 {
291 ERR("Could not attach input"); 291 ERR("Could not attach input");
292 eo_del(in); 292 eo_unref(in);
293 return EINA_FALSE; 293 return EINA_FALSE;
294 } 294 }
295 } 295 }
@@ -337,7 +337,7 @@ _edje_multisense_shutdown(void)
337 if (out) 337 if (out)
338 { 338 {
339 // XXX: this causes an abort inside of pa!!!!! 339 // XXX: this causes an abort inside of pa!!!!!
340 //eo_del(out); 340 //eo_unref(out);
341 out = NULL; 341 out = NULL;
342 outs = 0; 342 outs = 0;
343 } 343 }
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index ebfcf0cf23..b271d2b1de 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -52,7 +52,7 @@ _edje_object_eo_base_destructor(Eo *obj, Edje *class_data)
52{ 52{
53 if (class_data->file_obj) 53 if (class_data->file_obj)
54 { 54 {
55 eo_del(class_data->file_obj); 55 eo_unref(class_data->file_obj);
56 class_data->file_obj = NULL; 56 class_data->file_obj = NULL;
57 } 57 }
58 eo_destructor(eo_super(obj, MY_CLASS)); 58 eo_destructor(eo_super(obj, MY_CLASS));
@@ -366,7 +366,7 @@ _edje_object_efl_file_file_set(Eo *obj, Edje *ed, const char *file, const char *
366 366
367 if (ed->file_obj) 367 if (ed->file_obj)
368 { 368 {
369 eo_del(ed->file_obj); 369 eo_unref(ed->file_obj);
370 ed->file_obj = NULL; 370 ed->file_obj = NULL;
371 } 371 }
372 if (file) 372 if (file)
@@ -382,7 +382,7 @@ _edje_object_efl_file_file_set(Eo *obj, Edje *ed, const char *file, const char *
382 f = eina_file_open(file2, EINA_FALSE); 382 f = eina_file_open(file2, EINA_FALSE);
383 if (!f) 383 if (!f)
384 { 384 {
385 eo_del(ed->file_obj); 385 eo_unref(ed->file_obj);
386 ed->file_obj = NULL; 386 ed->file_obj = NULL;
387 if (ed->path) eina_stringshare_del(ed->path); 387 if (ed->path) eina_stringshare_del(ed->path);
388 ed->path = NULL; 388 ed->path = NULL;
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 3f725c1d36..4e227c81a7 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1154,7 +1154,7 @@ _elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1154 ELM_SAFE_FREE(sd->bg, evas_object_del); 1154 ELM_SAFE_FREE(sd->bg, evas_object_del);
1155 1155
1156 EINA_LIST_FREE(sd->items, it) 1156 EINA_LIST_FREE(sd->items, it)
1157 eo_del(it); 1157 eo_unref(it);
1158 1158
1159 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 1159 evas_obj_smart_del(eo_super(obj, MY_CLASS));
1160} 1160}
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index fcf52d3b3e..d0f6e86f41 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -575,7 +575,7 @@ _elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
575 { 575 {
576 ELM_HOVERSEL_ITEM_DATA_GET(eo_item, it); 576 ELM_HOVERSEL_ITEM_DATA_GET(eo_item, it);
577 ELM_SAFE_FREE(VIEW(it), evas_object_del); 577 ELM_SAFE_FREE(VIEW(it), evas_object_del);
578 eo_del(eo_item); 578 eo_unref(eo_item);
579 } 579 }
580 elm_hoversel_hover_parent_set(obj, NULL); 580 elm_hoversel_hover_parent_set(obj, NULL);
581 581
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index a154571b51..08a7635e60 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1594,7 +1594,7 @@ _elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *
1594 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; 1594 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
1595 1595
1596 EINA_LIST_FREE(sd->items, eo_item) 1596 EINA_LIST_FREE(sd->items, eo_item)
1597 eo_del(eo_item); 1597 eo_unref(eo_item);
1598 1598
1599 sd->items = NULL; 1599 sd->items = NULL;
1600 1600
diff --git a/src/lib/elementary/elm_app_client.c b/src/lib/elementary/elm_app_client.c
index fcdee64c86..22e41d1f09 100644
--- a/src/lib/elementary/elm_app_client.c
+++ b/src/lib/elementary/elm_app_client.c
@@ -104,7 +104,7 @@ _iface_del(void *data, const Eldbus_Message *msg)
104 104
105 eina_hash_del(cdata->views, path, NULL); 105 eina_hash_del(cdata->views, path, NULL);
106 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view); 106 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
107 eo_del(view); 107 eo_unref(view);
108 } 108 }
109} 109}
110 110
@@ -145,7 +145,7 @@ _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *
145 145
146 eina_hash_del(cdata->views, path, NULL); 146 eina_hash_del(cdata->views, path, NULL);
147 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view); 147 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
148 eo_del(view); 148 eo_unref(view);
149 } 149 }
150} 150}
151 151
@@ -313,7 +313,7 @@ _elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
313 313
314 iter = eina_hash_iterator_data_new(data->views); 314 iter = eina_hash_iterator_data_new(data->views);
315 EINA_ITERATOR_FOREACH(iter, view) 315 EINA_ITERATOR_FOREACH(iter, view)
316 eo_del(view); 316 eo_unref(view);
317 eina_iterator_free(iter); 317 eina_iterator_free(iter);
318 eina_hash_free(data->views); 318 eina_hash_free(data->views);
319 319
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 3db9909f48..e0e275b59d 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -46,7 +46,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
46 if (eina_hash_find(data->views, view_id)) 46 if (eina_hash_find(data->views, view_id))
47 { 47 {
48 ERR("%p already have a view with id=%s", data->pkg, view_id); 48 ERR("%p already have a view with id=%s", data->pkg, view_id);
49 eo_del(view); 49 eo_unref(view);
50 return EINA_FALSE; 50 return EINA_FALSE;
51 } 51 }
52 52
@@ -434,7 +434,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
434 { 434 {
435 //do not modify hash when iterating 435 //do not modify hash when iterating
436 eo_event_callback_del(view, EO_BASE_EVENT_DEL, _view_del_cb, data); 436 eo_event_callback_del(view, EO_BASE_EVENT_DEL, _view_del_cb, data);
437 eo_del(view); 437 eo_unref(view);
438 } 438 }
439 eina_iterator_free(iter); 439 eina_iterator_free(iter);
440 eina_hash_free(data->views); 440 eina_hash_free(data->views);
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 54ded2d8cb..a99b53e8f8 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -4460,7 +4460,7 @@ _elm_atspi_bridge_shutdown(void)
4460{ 4460{
4461 if (_init_count) 4461 if (_init_count)
4462 { 4462 {
4463 eo_del(_instance); 4463 eo_unref(_instance);
4464 _init_count = 0; 4464 _init_count = 0;
4465 } 4465 }
4466} 4466}
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index d61e41d20c..cb345e7794 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -232,7 +232,7 @@ _items_del(Elm_Colorselector_Data *sd)
232 232
233 EINA_LIST_FREE(sd->items, item) 233 EINA_LIST_FREE(sd->items, item)
234 { 234 {
235 eo_del (item); 235 eo_unref (item);
236 } 236 }
237 237
238 sd->items = NULL; 238 sd->items = NULL;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 052c4b3ef9..b23d29d105 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -172,7 +172,7 @@ _item_del_cb(void *data,
172 elm_layout_signal_emit(obj, buf, "elm"); 172 elm_layout_signal_emit(obj, buf, "elm");
173 173
174 VIEW(it) = NULL; 174 VIEW(it) = NULL;
175 eo_del(EO_OBJ(it)); 175 eo_unref(EO_OBJ(it));
176 176
177 elm_layout_sizing_eval(obj); 177 elm_layout_sizing_eval(obj);
178 break; 178 break;
@@ -258,7 +258,7 @@ _elm_dayselector_efl_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
258 int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content); 258 int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content);
259 if (!int_ret) 259 if (!int_ret)
260 { 260 {
261 eo_del(eo_it); 261 eo_unref(eo_it);
262 return EINA_FALSE; 262 return EINA_FALSE;
263 } 263 }
264 264
@@ -334,7 +334,7 @@ _elm_dayselector_efl_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd,
334 elm_layout_signal_emit(obj, buf, "elm"); 334 elm_layout_signal_emit(obj, buf, "elm");
335 335
336 VIEW(it) = NULL; 336 VIEW(it) = NULL;
337 eo_del(EO_OBJ(it)); 337 eo_unref(EO_OBJ(it));
338 338
339 elm_layout_sizing_eval(obj); 339 elm_layout_sizing_eval(obj);
340 340
@@ -441,7 +441,7 @@ _elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
441 { 441 {
442 sd->items = eina_list_remove(sd->items, it); 442 sd->items = eina_list_remove(sd->items, it);
443 eina_stringshare_del(it->day_style); 443 eina_stringshare_del(it->day_style);
444 eo_del(EO_OBJ(it)); 444 eo_unref(EO_OBJ(it));
445 } 445 }
446 446
447 /* handles freeing sd */ 447 /* handles freeing sd */
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 249a26e8a1..8e5c0d1ac3 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1131,7 +1131,7 @@ _round_item_del(Elm_Diskselector_Data *sd EINA_UNUSED,
1131 Elm_Diskselector_Item_Data *it) 1131 Elm_Diskselector_Item_Data *it)
1132{ 1132{
1133 if (!it) return; 1133 if (!it) return;
1134 eo_del(EO_OBJ(it)); 1134 eo_unref(EO_OBJ(it));
1135} 1135}
1136 1136
1137static void 1137static void
@@ -1362,28 +1362,28 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1362 if (sd->last) 1362 if (sd->last)
1363 { 1363 {
1364 evas_object_del(sd->VIEW(last)); 1364 evas_object_del(sd->VIEW(last));
1365 eo_del(EO_OBJ(sd->last)); 1365 eo_unref(EO_OBJ(sd->last));
1366 sd->last = NULL; 1366 sd->last = NULL;
1367 } 1367 }
1368 1368
1369 if (sd->s_last) 1369 if (sd->s_last)
1370 { 1370 {
1371 evas_object_del(sd->VIEW(s_last)); 1371 evas_object_del(sd->VIEW(s_last));
1372 eo_del(EO_OBJ(sd->s_last)); 1372 eo_unref(EO_OBJ(sd->s_last));
1373 sd->s_last = NULL; 1373 sd->s_last = NULL;
1374 } 1374 }
1375 1375
1376 if (sd->second) 1376 if (sd->second)
1377 { 1377 {
1378 evas_object_del(sd->VIEW(second)); 1378 evas_object_del(sd->VIEW(second));
1379 eo_del(EO_OBJ(sd->second)); 1379 eo_unref(EO_OBJ(sd->second));
1380 sd->second = NULL; 1380 sd->second = NULL;
1381 } 1381 }
1382 1382
1383 if (sd->first) 1383 if (sd->first)
1384 { 1384 {
1385 evas_object_del(sd->VIEW(first)); 1385 evas_object_del(sd->VIEW(first));
1386 eo_del(EO_OBJ(sd->first)); 1386 eo_unref(EO_OBJ(sd->first));
1387 sd->first = NULL; 1387 sd->first = NULL;
1388 } 1388 }
1389 1389
@@ -1392,7 +1392,7 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1392 if (it) 1392 if (it)
1393 { 1393 {
1394 evas_object_del(VIEW(it)); 1394 evas_object_del(VIEW(it));
1395 eo_del(EO_OBJ(it)); 1395 eo_unref(EO_OBJ(it));
1396 } 1396 }
1397 } 1397 }
1398 sd->under_items = eina_list_free(sd->under_items); 1398 sd->under_items = eina_list_free(sd->under_items);
@@ -1402,14 +1402,14 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1402 if (it) 1402 if (it)
1403 { 1403 {
1404 evas_object_del(VIEW(it)); 1404 evas_object_del(VIEW(it));
1405 eo_del(EO_OBJ(it)); 1405 eo_unref(EO_OBJ(it));
1406 } 1406 }
1407 } 1407 }
1408 sd->over_items = eina_list_free(sd->over_items); 1408 sd->over_items = eina_list_free(sd->over_items);
1409 1409
1410 EINA_LIST_FOREACH_SAFE(sd->items, l, l2, it) 1410 EINA_LIST_FOREACH_SAFE(sd->items, l, l2, it)
1411 { 1411 {
1412 eo_del(EO_OBJ(it)); 1412 eo_unref(EO_OBJ(it));
1413 } 1413 }
1414 sd->items = eina_list_free(sd->items); 1414 sd->items = eina_list_free(sd->items);
1415 sd->r_items = eina_list_free(sd->r_items); 1415 sd->r_items = eina_list_free(sd->r_items);
@@ -1636,7 +1636,7 @@ _elm_diskselector_clear(Eo *obj, Elm_Diskselector_Data *sd)
1636 sd->selected_item = NULL; 1636 sd->selected_item = NULL;
1637 EINA_LIST_FREE(sd->items, it) 1637 EINA_LIST_FREE(sd->items, it)
1638 { 1638 {
1639 eo_del(EO_OBJ(it)); 1639 eo_unref(EO_OBJ(it));
1640 } 1640 }
1641 1641
1642 _round_items_del(sd); 1642 _round_items_del(sd);
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 93d26449c4..be9888a89b 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4066,7 +4066,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
4066 if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next); 4066 if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next);
4067 if (itn) itn->walking++; /* prevent early death of subitem */ 4067 if (itn) itn->walking++; /* prevent early death of subitem */
4068 it->del_cb(it); 4068 it->del_cb(it);
4069 eo_del(EO_OBJ(it)); 4069 eo_unref(EO_OBJ(it));
4070 if (itn) itn->walking--; 4070 if (itn) itn->walking--;
4071 } 4071 }
4072 } 4072 }
@@ -4138,7 +4138,7 @@ _item_select(Elm_Gen_Item *it)
4138 if ((!it->walking) && (it->generation < sd->generation)) 4138 if ((!it->walking) && (it->generation < sd->generation))
4139 { 4139 {
4140 it->del_cb(it); 4140 it->del_cb(it);
4141 eo_del(eo_it); 4141 eo_unref(eo_it);
4142 sd->last_selected_item = NULL; 4142 sd->last_selected_item = NULL;
4143 } 4143 }
4144 } 4144 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 45bb5b3c5d..afb41cf0c1 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5859,7 +5859,7 @@ _item_select(Elm_Gen_Item *it)
5859item_deleted: 5859item_deleted:
5860 it->walking = -1; //This item was removed from it's item list. 5860 it->walking = -1; //This item was removed from it's item list.
5861 _item_del(it); 5861 _item_del(it);
5862 eo_del(eo_it); 5862 eo_unref(eo_it);
5863 evas_object_unref(obj); 5863 evas_object_unref(obj);
5864 return EINA_TRUE; 5864 return EINA_TRUE;
5865} 5865}
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 9a0e71b054..11c871d0bb 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -668,7 +668,7 @@ _elm_list_deletions_process(Elm_List_Data *sd)
668 668
669 /* issuing free because of "locking" item del pre hook */ 669 /* issuing free because of "locking" item del pre hook */
670 _elm_list_item_free(it); 670 _elm_list_item_free(it);
671 eo_del(EO_OBJ(it)); 671 eo_unref(EO_OBJ(it));
672 } 672 }
673 673
674 sd->walking--; 674 sd->walking--;
@@ -2485,7 +2485,7 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
2485 /* issuing free because of "locking" item del pre hook */ 2485 /* issuing free because of "locking" item del pre hook */
2486 _elm_list_item_free(it); 2486 _elm_list_item_free(it);
2487 WIDGET(it) = NULL; 2487 WIDGET(it) = NULL;
2488 eo_del(eo_it); 2488 eo_unref(eo_it);
2489 } 2489 }
2490 2490
2491 _elm_list_unwalk(obj, sd); 2491 _elm_list_unwalk(obj, sd);
@@ -2746,7 +2746,7 @@ _elm_list_clear(Eo *obj, Elm_List_Data *sd)
2746 ELM_LIST_ITEM_DATA_GET(eo_it, it); 2746 ELM_LIST_ITEM_DATA_GET(eo_it, it);
2747 /* issuing free because of "locking" item del pre hook */ 2747 /* issuing free because of "locking" item del pre hook */
2748 _elm_list_item_free(it); 2748 _elm_list_item_free(it);
2749 eo_del(eo_it); 2749 eo_unref(eo_it);
2750 } 2750 }
2751 2751
2752 _elm_list_unwalk(obj, sd); 2752 _elm_list_unwalk(obj, sd);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 372d67692e..49598dedb4 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -54,7 +54,7 @@ _item_del(Elm_Object_Item *eo_item)
54 _item_del(child); 54 _item_del(child);
55 eina_list_free(item->submenu.items); 55 eina_list_free(item->submenu.items);
56 56
57 eo_del(eo_item); 57 eo_unref(eo_item);
58} 58}
59 59
60static void 60static void
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index d77b93227a..b1a26b518e 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -633,7 +633,7 @@ _elm_segment_control_evas_object_smart_del(Eo *obj, Elm_Segment_Control_Data *sd
633 633
634 EINA_LIST_FREE(sd->items, eo_it) 634 EINA_LIST_FREE(sd->items, eo_it)
635 { 635 {
636 eo_del(eo_it); 636 eo_unref(eo_it);
637 } 637 }
638 638
639 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 639 evas_obj_smart_del(eo_super(obj, MY_CLASS));
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index c3d5879ab7..98d0931294 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -643,7 +643,7 @@ _elm_slideshow_clear(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd)
643 sd->current = NULL; 643 sd->current = NULL;
644 644
645 EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item) 645 EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item)
646 eo_del(eo_item); 646 eo_unref(eo_item);
647} 647}
648 648
649EOLIAN static const Eina_List* 649EOLIAN static const Eina_List*
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index c58659a1a3..1cb69c2cd9 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -155,7 +155,7 @@ _elm_sys_notify_servers_set(Eo *obj EINA_UNUSED,
155 { 155 {
156 /* Delete if server type is not provided */ 156 /* Delete if server type is not provided */
157 if (!(servers & (1 << i))) 157 if (!(servers & (1 << i)))
158 eo_del(sd->servers[i]); 158 eo_unref(sd->servers[i]);
159 } 159 }
160 else 160 else
161 { 161 {
@@ -223,7 +223,7 @@ _elm_unneed_sys_notify(void)
223 if (manager) 223 if (manager)
224 { 224 {
225 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE); 225 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
226 eo_del(manager); 226 eo_unref(manager);
227 } 227 }
228} 228}
229 229
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 662a804d40..ebc60101c8 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -4579,7 +4579,7 @@ _elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
4579 Eina_Bool del_ok; 4579 Eina_Bool del_ok;
4580 del_ok = elm_wdg_item_del_pre(item->eo_obj); 4580 del_ok = elm_wdg_item_del_pre(item->eo_obj);
4581 if (del_ok) 4581 if (del_ok)
4582 eo_del(item->eo_obj); 4582 eo_unref(item->eo_obj);
4583 return; 4583 return;
4584} 4584}
4585 4585
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 3314441fb4..566720f979 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -834,7 +834,6 @@ EAPI int eo_ref_get(const Eo *obj);
834 * 834 *
835 * @see eo_del_intercept_get() 835 * @see eo_del_intercept_get()
836 * @see eo_unref() 836 * @see eo_unref()
837 * @see eo_del()
838 */ 837 */
839EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func); 838EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
840 839
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 0eac55c0bb..88e22db8eb 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -684,7 +684,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
684 ERR("Object of class '%s' - Error while constructing object", 684 ERR("Object of class '%s' - Error while constructing object",
685 klass->desc->name); 685 klass->desc->name);
686 _eo_unref(obj); 686 _eo_unref(obj);
687 eo_del((Eo *) obj->header.id); 687 _eo_unref(obj);
688 return NULL; 688 return NULL;
689 } 689 }
690 690
@@ -734,7 +734,7 @@ _eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
734 734
735cleanup: 735cleanup:
736 _eo_unref(obj); 736 _eo_unref(obj);
737 eo_del((Eo *) obj->header.id); 737 _eo_unref(obj);
738 return NULL; 738 return NULL;
739} 739}
740 740
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 9e549b4023..6a22b2a3ba 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -73,15 +73,6 @@ abstract Eo.Base ()
73 parent: Eo.Base * @nullable; [[the new parent]] 73 parent: Eo.Base * @nullable; [[the new parent]]
74 } 74 }
75 } 75 }
76 del @const {
77 [[Unrefs the object and reparents it to NULL.
78
79 Because eo_del() unrefs and reparents to NULL, it doesn't really delete the object.
80
81 This method accepts a const object for convenience, so all objects
82 could be passed to it easily.
83 ]]
84 }
85 @property name { 76 @property name {
86 [[ The name of the object. 77 [[ The name of the object.
87 78
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index c95cfba098..588fbf1d59 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -462,19 +462,6 @@ _eo_base_comment_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd)
462} 462}
463 463
464EOLIAN static void 464EOLIAN static void
465_eo_base_del(const Eo *obj, Eo_Base_Data *pd EINA_UNUSED)
466{
467 if (eo_parent_get((Eo *) obj))
468 {
469 eo_parent_set((Eo *) obj, NULL);
470 }
471 else
472 {
473 eo_unref(obj);
474 }
475}
476
477EOLIAN static void
478_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id) 465_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
479{ 466{
480 if (pd->parent == parent_id) 467 if (pd->parent == parent_id)
@@ -1442,7 +1429,7 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1442 1429
1443 if (pd->parent) 1430 if (pd->parent)
1444 { 1431 {
1445 ERR("Object '%p' still has a parent at the time of destruction.", obj); 1432 /* A bit ugly, but unparent unrefs, so we need to ref before. */
1446 eo_ref(obj); 1433 eo_ref(obj);
1447 eo_parent_set(obj, NULL); 1434 eo_parent_set(obj, NULL);
1448 } 1435 }
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index e799773df4..dc4167fe78 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -623,7 +623,7 @@ _image_pixels_set(Evas_Object_Protected_Data *obj,
623 } 623 }
624 if (o->file_obj) 624 if (o->file_obj)
625 { 625 {
626 eo_del(o->file_obj); 626 eo_unref(o->file_obj);
627 o->file_obj = NULL; 627 o->file_obj = NULL;
628 } 628 }
629 629
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 897192ebd6..cc9b395dc5 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -584,7 +584,7 @@ evas_object_image_data_set(Eo *eo_obj, void *data)
584 o->engine_data = NULL; 584 o->engine_data = NULL;
585 if (o->file_obj) 585 if (o->file_obj)
586 { 586 {
587 eo_del(o->file_obj); 587 eo_unref(o->file_obj);
588 o->file_obj = NULL; 588 o->file_obj = NULL;
589 } 589 }
590 } 590 }
@@ -664,7 +664,7 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data)
664 ENFN->image_free(ENDT, o->engine_data); 664 ENFN->image_free(ENDT, o->engine_data);
665 if (o->file_obj) 665 if (o->file_obj)
666 { 666 {
667 eo_del(o->file_obj); 667 eo_unref(o->file_obj);
668 o->file_obj = NULL; 668 o->file_obj = NULL;
669 } 669 }
670 o->engine_data = ENFN->image_new_from_copied_data(ENDT, 670 o->engine_data = ENFN->image_new_from_copied_data(ENDT,
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index bb192b9868..740413ae56 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -262,7 +262,7 @@ _evas_image_init_set(const Eina_File *f, const char *file, const char *key,
262 } 262 }
263 if (o->file_obj) 263 if (o->file_obj)
264 { 264 {
265 eo_del(o->file_obj); 265 eo_unref(o->file_obj);
266 o->file_obj = NULL; 266 o->file_obj = NULL;
267 } 267 }
268 o->load_error = EVAS_LOAD_ERROR_NONE; 268 o->load_error = EVAS_LOAD_ERROR_NONE;
@@ -1429,7 +1429,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1429 o->engine_data = NULL; 1429 o->engine_data = NULL;
1430 if (o->file_obj) 1430 if (o->file_obj)
1431 { 1431 {
1432 eo_del(o->file_obj); 1432 eo_unref(o->file_obj);
1433 o->file_obj = NULL; 1433 o->file_obj = NULL;
1434 } 1434 }
1435 if (o->pixels->pixel_updates) 1435 if (o->pixels->pixel_updates)
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 83a85bf4ae..59b8457cf5 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -735,7 +735,7 @@ evas_object_del(Evas_Object *eo_obj)
735 evas_object_hide(eo_obj); 735 evas_object_hide(eo_obj);
736 obj->eo_del_called = EINA_TRUE; 736 obj->eo_del_called = EINA_TRUE;
737 737
738 eo_del(eo_obj); 738 eo_unref(eo_obj);
739} 739}
740 740
741EOLIAN static void 741EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 1a0cdcbea9..5b843b0004 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -287,7 +287,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
287 287
288 if (pd->renderer) 288 if (pd->renderer)
289 { 289 {
290 eo_del(pd->renderer); 290 eo_unref(pd->renderer);
291 pd->renderer = NULL; 291 pd->renderer = NULL;
292 } 292 }
293 if (pd->intp) 293 if (pd->intp)
@@ -670,7 +670,7 @@ _efl_vg_interpolate(Eo *obj,
670 tod = eo_data_scope_get(to, EFL_VG_CLASS); 670 tod = eo_data_scope_get(to, EFL_VG_CLASS);
671 from_map = 1.0 - pos_map; 671 from_map = 1.0 - pos_map;
672 672
673 eo_del(pd->renderer); 673 eo_unref(pd->renderer);
674 pd->renderer = NULL; 674 pd->renderer = NULL;
675 675
676 if (fromd->m || tod->m) 676 if (fromd->m || tod->m)
@@ -760,7 +760,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
760 760
761 if (pd->renderer) 761 if (pd->renderer)
762 { 762 {
763 eo_del(pd->renderer); 763 eo_unref(pd->renderer);
764 pd->renderer = NULL; 764 pd->renderer = NULL;
765 } 765 }
766 766
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index fef55f492d..1bb6609cd8 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -90,7 +90,7 @@ static void
90_filter_buffer_backing_free(Evas_Filter_Buffer *fb) 90_filter_buffer_backing_free(Evas_Filter_Buffer *fb)
91{ 91{
92 if (!fb || !fb->buffer) return; 92 if (!fb || !fb->buffer) return;
93 eo_del(fb->buffer); 93 eo_unref(fb->buffer);
94 fb->buffer = NULL; 94 fb->buffer = NULL;
95} 95}
96 96
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ca8d83950b..11a5530320 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2490,7 +2490,7 @@ eng_ector_create(void *data EINA_UNUSED)
2490static void 2490static void
2491eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector) 2491eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector)
2492{ 2492{
2493 if (ector) eo_del(ector); 2493 if (ector) eo_unref(ector);
2494} 2494}
2495 2495
2496static Ector_Buffer * 2496static Ector_Buffer *
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 1c473a5d8b..541541b42d 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4049,7 +4049,7 @@ eng_ector_create(void *data EINA_UNUSED)
4049static void 4049static void
4050eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector) 4050eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector)
4051{ 4051{
4052 if (ector) eo_del(ector); 4052 if (ector) eo_unref(ector);
4053} 4053}
4054 4054
4055static Ector_Buffer * 4055static Ector_Buffer *
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 0240903e0b..e3410ae573 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -83,8 +83,8 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
83 ecore_main_loop_begin(); 83 ecore_main_loop_begin();
84 fail_if(pulse_context_failed); 84 fail_if(pulse_context_failed);
85 85
86 eo_del(out); 86 eo_unref(out);
87 eo_del(in); 87 eo_unref(in);
88} 88}
89END_TEST 89END_TEST
90#endif 90#endif
@@ -100,7 +100,7 @@ static Eina_Bool
100_idle_del(void *data) 100_idle_del(void *data)
101{ 101{
102 Eo *in = data; 102 Eo *in = data;
103 eo_del(in); 103 eo_unref(in);
104 ecore_idler_add(_quit, NULL); 104 ecore_idler_add(_quit, NULL);
105 105
106 return EINA_FALSE; 106 return EINA_FALSE;
@@ -218,8 +218,8 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
218 218
219 ecore_main_loop_begin(); 219 ecore_main_loop_begin();
220 220
221 eo_del(in); 221 eo_unref(in);
222 eo_del(out); 222 eo_unref(out);
223 223
224 //TODO: Compare and fail 224 //TODO: Compare and fail
225 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 225 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -308,8 +308,8 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
308 308
309 ecore_main_loop_begin(); 309 ecore_main_loop_begin();
310 310
311 eo_del(in); 311 eo_unref(in);
312 eo_del(out); 312 eo_unref(out);
313 313
314 //TODO: Compare and fail 314 //TODO: Compare and fail
315 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 315 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -361,20 +361,20 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
361 fail_if(eina_list_count(in3) != 2); 361 fail_if(eina_list_count(in3) != 2);
362 fail_if(eina_list_data_get(in3) != in); 362 fail_if(eina_list_data_get(in3) != in);
363 363
364 eo_del(in2); 364 eo_unref(in2);
365 365
366 in3 = ecore_audio_obj_out_inputs_get(out); 366 in3 = ecore_audio_obj_out_inputs_get(out);
367 367
368 fail_if(eina_list_count(in3) != 1); 368 fail_if(eina_list_count(in3) != 1);
369 fail_if(eina_list_data_get(in3) != in); 369 fail_if(eina_list_data_get(in3) != in);
370 370
371 eo_del(out); 371 eo_unref(out);
372 372
373 out2 = ecore_audio_obj_in_output_get(in); 373 out2 = ecore_audio_obj_in_output_get(in);
374 374
375 fail_if(out2); 375 fail_if(out2);
376 376
377 eo_del(in); 377 eo_unref(in);
378} 378}
379END_TEST 379END_TEST
380 380
@@ -433,8 +433,8 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
433 433
434 ecore_main_loop_begin(); 434 ecore_main_loop_begin();
435 435
436 eo_del(out); 436 eo_unref(out);
437 eo_del(in); 437 eo_unref(in);
438} 438}
439END_TEST 439END_TEST
440 440
@@ -533,7 +533,7 @@ START_TEST(ecore_test_ecore_audio_obj_in)
533 fail_if(buf[i] != 0x00); 533 fail_if(buf[i] != 0x00);
534 } 534 }
535 535
536 eo_del(in); 536 eo_unref(in);
537} 537}
538END_TEST 538END_TEST
539 539
@@ -581,7 +581,7 @@ START_TEST(ecore_test_ecore_audio_obj)
581 volume = ecore_audio_obj_volume_get(obj); 581 volume = ecore_audio_obj_volume_get(obj);
582 fail_if(volume != 0.5); 582 fail_if(volume != 0.5);
583 583
584 eo_del(obj); 584 eo_unref(obj);
585 } 585 }
586 586
587} 587}
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index bcd36f1385..9e0ddfaf43 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -714,7 +714,7 @@ START_TEST(edje_test_table_eoapi)
714 714
715 i = eo_ref_get(table); 715 i = eo_ref_get(table);
716 fail_if(i != 1); 716 fail_if(i != 1);
717 eo_del(table); 717 eo_unref(table);
718 718
719 /* this will generate eo errors */ 719 /* this will generate eo errors */
720 k = eo_ref_get(table); 720 k = eo_ref_get(table);
@@ -733,7 +733,7 @@ START_TEST(edje_test_table_eoapi)
733 fail_if(eo_ref_get(other) != 1); 733 fail_if(eo_ref_get(other) != 1);
734 734
735 /* delete edje and verify proxy died */ 735 /* delete edje and verify proxy died */
736 eo_del(obj); 736 eo_unref(obj);
737 737
738 /* this will generate eo errors */ 738 /* this will generate eo errors */
739 fail_if(eo_ref_get(table) > 0); 739 fail_if(eo_ref_get(table) > 0);
@@ -752,7 +752,7 @@ START_TEST(edje_test_table_eoapi)
752 fail_if(!table); 752 fail_if(!table);
753 eo_ref(table); 753 eo_ref(table);
754 fflush(stderr); 754 fflush(stderr);
755 eo_del(obj); 755 eo_unref(obj);
756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */ 756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */
757 fail_if(eo_ref_get(table) > 1); 757 fail_if(eo_ref_get(table) > 1);
758 758
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 82c1564e37..2b39efc554 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -438,7 +438,7 @@ START_TEST (elm_atspi_relationship_remove)
438 /* Test if relationship is implicity removed when object is deleted */ 438 /* Test if relationship is implicity removed when object is deleted */
439 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 439 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
440 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); 440 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
441 eo_del(g_bg); 441 eo_unref(g_bg);
442 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 442 set = elm_interface_atspi_accessible_relation_set_get(g_btn);
443 443
444 rel_to = rel_from = NULL; 444 rel_to = rel_from = NULL;
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index c1d55a571d..e372e2cbac 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -97,7 +97,7 @@ main_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_
97 EINA_LIST_FREE(video_objs, o) 97 EINA_LIST_FREE(video_objs, o)
98 { 98 {
99 emotion_object_last_position_save(o); 99 emotion_object_last_position_save(o);
100 eo_del(o); 100 eo_unref(o);
101 } 101 }
102 return EINA_TRUE; 102 return EINA_TRUE;
103} 103}
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 9d30277333..ba6f6a285e 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
40 40
41 eina_iterator_free(iter); 41 eina_iterator_free(iter);
42 42
43 eo_del(child2); 43 eo_unref(child2);
44 44
45 iter = eo_children_iterator_new(parent); 45 iter = eo_children_iterator_new(parent);
46 fail_if(!iter); 46 fail_if(!iter);
@@ -52,7 +52,7 @@ main(int argc, char *argv[])
52 eina_iterator_free(iter); 52 eina_iterator_free(iter);
53 53
54 54
55 eo_del(child1); 55 eo_unref(child1);
56 56
57 iter = eo_children_iterator_new(parent); 57 iter = eo_children_iterator_new(parent);
58 fail_if(!iter); 58 fail_if(!iter);
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
62 eina_iterator_free(iter); 62 eina_iterator_free(iter);
63 63
64 64
65 eo_del(child3); 65 eo_unref(child3);
66 66
67 iter = eo_children_iterator_new(parent); 67 iter = eo_children_iterator_new(parent);
68 fail_if(iter); 68 fail_if(iter);
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 12c478f454..8533b3105e 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -81,8 +81,8 @@ START_TEST(eo_destructor_double_del)
81 fail_if(!obj); 81 fail_if(!obj);
82 82
83 TEST_EO_ERROR("_eo_unref", "Object %p already destructed."); 83 TEST_EO_ERROR("_eo_unref", "Object %p already destructed.");
84 eo_del(obj); 84 eo_unref(obj);
85 eo_del(obj); 85 eo_unref(obj);
86 86
87 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 87 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
88 88
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index accc9c0351..b2de49d2be 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -310,11 +310,11 @@ START_TEST(eo_composite_tests)
310 fail_if(!eo_composite_part_is(obj2)); 310 fail_if(!eo_composite_part_is(obj2));
311 311
312 /* Check that a deletion of a child detaches from the parent. */ 312 /* Check that a deletion of a child detaches from the parent. */
313 eo_del(obj2); 313 eo_unref(obj2);
314 fail_if(!eo_composite_attach(obj3, obj)); 314 fail_if(!eo_composite_attach(obj3, obj));
315 315
316 /* Check that a deletion of the parent detaches the child. */ 316 /* Check that a deletion of the parent detaches the child. */
317 eo_del(obj3); 317 eo_unref(obj3);
318 fail_if(eo_composite_part_is(obj)); 318 fail_if(eo_composite_part_is(obj));
319 319
320 eo_unref(obj); 320 eo_unref(obj);
@@ -514,9 +514,9 @@ START_TEST(eo_refs)
514 ck_assert_int_eq(eo_ref_get(obj2), 1); 514 ck_assert_int_eq(eo_ref_get(obj2), 1);
515 ck_assert_int_eq(eo_ref_get(obj3), 1); 515 ck_assert_int_eq(eo_ref_get(obj3), 1);
516 516
517 eo_del(obj); 517 eo_unref(obj);
518 eo_del(obj2); 518 eo_unref(obj2);
519 eo_del(obj3); 519 eo_unref(obj3);
520 520
521 /* Just check it doesn't seg atm. */ 521 /* Just check it doesn't seg atm. */
522 obj = eo_add(SIMPLE_CLASS, NULL); 522 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -528,7 +528,7 @@ START_TEST(eo_refs)
528 obj2 = eo_add(SIMPLE_CLASS, obj); 528 obj2 = eo_add(SIMPLE_CLASS, obj);
529 eo_unref(obj2); 529 eo_unref(obj2);
530 eo_ref(obj2); 530 eo_ref(obj2);
531 eo_del(obj2); 531 eo_unref(obj2);
532 eo_unref(obj); 532 eo_unref(obj);
533 533
534 eo_shutdown(); 534 eo_shutdown();
@@ -743,7 +743,6 @@ START_TEST(eo_magic_checks)
743 743
744 eo_ref((Eo *) buf); 744 eo_ref((Eo *) buf);
745 eo_unref((Eo *) buf); 745 eo_unref((Eo *) buf);
746 eo_del((Eo *) buf);
747 746
748 eo_isa((Eo *) buf, SIMPLE_CLASS); 747 eo_isa((Eo *) buf, SIMPLE_CLASS);
749 eo_isa(obj, (Eo_Class *) buf); 748 eo_isa(obj, (Eo_Class *) buf);
@@ -1056,7 +1055,7 @@ START_TEST(eo_del_intercept)
1056 fail_if(!obj); 1055 fail_if(!obj);
1057 fail_if(!eo_isa(obj, klass)); 1056 fail_if(!eo_isa(obj, klass));
1058 eo_del_intercept_set(obj, _del_intercept); 1057 eo_del_intercept_set(obj, _del_intercept);
1059 eo_del(obj); 1058 eo_unref(obj);
1060 fail_if(!intercepted); 1059 fail_if(!intercepted);
1061 fail_if(eo_isa(obj, klass)); 1060 fail_if(eo_isa(obj, klass));
1062 1061
@@ -1116,7 +1115,7 @@ START_TEST(eo_name)
1116 objtmp = eo_name_find(obj, "*mple:joe"); 1115 objtmp = eo_name_find(obj, "*mple:joe");
1117 fail_if(objtmp != obj2); 1116 fail_if(objtmp != obj2);
1118 1117
1119 eo_del(obj); 1118 eo_unref(obj);
1120 1119
1121 eo_shutdown(); 1120 eo_shutdown();
1122} 1121}
@@ -1146,7 +1145,7 @@ START_TEST(eo_comment)
1146 comment = eo_comment_get(obj); 1145 comment = eo_comment_get(obj);
1147 fail_if(NULL != comment); 1146 fail_if(NULL != comment);
1148 1147
1149 eo_del(obj); 1148 eo_unref(obj);
1150 1149
1151 eo_shutdown(); 1150 eo_shutdown();
1152} 1151}
@@ -1163,7 +1162,7 @@ START_TEST(eo_rec_interface)
1163 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS); 1162 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS);
1164 fail_if(objtmp != s); 1163 fail_if(objtmp != s);
1165 1164
1166 eo_del(obj); 1165 eo_unref(obj);
1167 1166
1168 eo_shutdown(); 1167 eo_shutdown();
1169} 1168}
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 7f90754872..1408525dc4 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -638,16 +638,16 @@ START_TEST(evas_object_image_defaults)
638 fail_if(evas_object_image_filled_get(o)); 638 fail_if(evas_object_image_filled_get(o));
639 evas_object_image_fill_get(o, &x, &y, &w, &h); 639 evas_object_image_fill_get(o, &x, &y, &w, &h);
640 fail_if(x || y || w || h); 640 fail_if(x || y || w || h);
641 eo_del(o); 641 eo_unref(o);
642 642
643 o = evas_object_image_filled_add(e); 643 o = evas_object_image_filled_add(e);
644 fail_if(!evas_object_image_filled_get(o)); 644 fail_if(!evas_object_image_filled_get(o));
645 eo_del(o); 645 eo_unref(o);
646 646
647 /* test eo defaults */ 647 /* test eo defaults */
648 o = eo_add(EVAS_IMAGE_CLASS, e); 648 o = eo_add(EVAS_IMAGE_CLASS, e);
649 fail_if(!efl_gfx_fill_auto_get(o)); 649 fail_if(!efl_gfx_fill_auto_get(o));
650 eo_del(o); 650 eo_unref(o);
651 651
652 evas_free(e); 652 evas_free(e);
653 evas_shutdown(); 653 evas_shutdown();
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index aba8a0bfc8..9dea211c04 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -65,8 +65,8 @@
65 fail_if(!set_ok); \ 65 fail_if(!set_ok); \
66 res = _compare_meshes(mesh, mesh2); \ 66 res = _compare_meshes(mesh, mesh2); \
67 fail_if(res == 1); \ 67 fail_if(res == 1); \
68 eo_del(mesh2); \ 68 eo_unref(mesh2); \
69 eo_del(mesh); \ 69 eo_unref(mesh); \
70 unlink(buffer); \ 70 unlink(buffer); \
71 } 71 }
72 72