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.c2
-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.c14
-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.c2
-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, 153 insertions, 128 deletions
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index e0c1f0ae32..f2b5cf0a66 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_unref(event->object); 48 eo_del(event->object);
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 803ced8e51..8133b7ff15 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_unref(app); 286 eo_del(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 5b5166c74b..cb9ea1ee0f 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_unref(obj); 505 eo_del(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 23052a7c1b..2794bb3982 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_unref(event->object); 149 eo_del(event->object);
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 1453dc2f7b..29be761f72 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->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 eo_unref(event->object); 204 eo_del(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);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 7041451430..a9451eab0e 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->object, &out); 26 ecore_audio_obj_in_output_get(event->object, &out);
27 eo_unref(event->object); 27 eo_del(event->object);
28 eo_unref(out); 28 eo_del(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_unref(in); 57 eo_del(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_unref(in); 67 eo_del(in);
68 eo_unref(out); 68 eo_del(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_unref(out); 75 eo_del(out);
76 eo_unref(in); 76 eo_del(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 b364022b2d..239655e0ef 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_unref(node);Unless evas_canvas3d_destructors work properly*/ 292 /*eo_del(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_unref(m); Unless evas_canvas3d_destructors work properly*/ 301 /*eo_del(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 da0dfda91b..6c533335be 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_unref(_mainloop_singleton); 370 eo_del(_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_unref(vpath); 416 eo_del(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 941eb72293..3063b79685 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_unref(obj); 212 eo_del(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 71d44b9570..6a6095c80a 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_unref(t->u.timer); 2836 eo_del(t->u.timer);
2837 2837
2838 return EO_CALLBACK_CONTINUE; 2838 return EO_CALLBACK_CONTINUE;
2839} 2839}
@@ -2876,7 +2876,7 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner* promise EINA_UNUSED)
2876 if (j->job_is) 2876 if (j->job_is)
2877 ecore_job_del(j->u.job); 2877 ecore_job_del(j->u.job);
2878 else 2878 else
2879 eo_unref(j->u.timer); 2879 eo_del(j->u.timer);
2880 _efl_loop_internal_cancel(j); 2880 _efl_loop_internal_cancel(j);
2881} 2881}
2882 2882
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 041fafeba5..15d80cb91e 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_unref(event->object); 175 eo_del(event->object);
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_unref(timer); 242 eo_del(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_unref(timer->object); 487 eo_del(timer->object);
488 488
489 EINA_INLIST_FREE(suspended, timer) 489 EINA_INLIST_FREE(suspended, timer)
490 eo_unref(timer->object); 490 eo_del(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 2dc0d57e5c..7faf36dd9f 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_unref(obj); 335 eo_del(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_unref(obj); 1296 eo_del(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_unref(obj); 1384 eo_del(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_unref(obj); 2133 eo_del(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 29cc8b7ce6..4812d577ba 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_unref(r); 745 eo_del(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 8814a864f3..14bf8b2b45 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_unref(cl_obj); 359 eo_del(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 72870af1fe..3037d2cd5b 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_unref(url_obj); 377 eo_del(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 9086babc6a..0fdd1a1230 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_unref(file_obj); 203 eo_del(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_unref(file_obj); 210 eo_del(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 1a5800365d..2d08526fd8 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_unref(file_obj); 260 eo_del(file_obj);
261 return lst; 261 return lst;
262} 262}
263 263
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 8020cd6c05..31028ce176 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_unref(event->object); 13 eo_del(event->object);
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_unref(event->object); 22 eo_del(event->object);
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_unref(in); 222 eo_del(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_unref(in); 229 eo_del(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_unref(in); 292 eo_del(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_unref(out); 340 //eo_del(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 b271d2b1de..ebfcf0cf23 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_unref(class_data->file_obj); 55 eo_del(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_unref(ed->file_obj); 369 eo_del(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_unref(ed->file_obj); 385 eo_del(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 4e070fd481..3ef52c5ddf 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1146,7 +1146,7 @@ _elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1146 ELM_SAFE_FREE(sd->bg, evas_object_del); 1146 ELM_SAFE_FREE(sd->bg, evas_object_del);
1147 1147
1148 EINA_LIST_FREE(sd->items, it) 1148 EINA_LIST_FREE(sd->items, it)
1149 eo_unref(it); 1149 eo_del(it);
1150 1150
1151 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 1151 evas_obj_smart_del(eo_super(obj, MY_CLASS));
1152} 1152}
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index df041f321a..3d97254f3e 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_unref(eo_item); 578 eo_del(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 08a7635e60..a154571b51 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_unref(eo_item); 1597 eo_del(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 22e41d1f09..fcdee64c86 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_unref(view); 107 eo_del(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_unref(view); 148 eo_del(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_unref(view); 316 eo_del(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 52284aa5ff..4899388846 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_unref(view); 49 eo_del(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_EVENT_DEL, _view_del_cb, data); 436 eo_event_callback_del(view, EO_EVENT_DEL, _view_del_cb, data);
437 eo_unref(view); 437 eo_del(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 b42a109ac1..c49568d1df 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_unref(_instance); 4463 eo_del(_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 12e8cda550..f29b872cd7 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_unref (item); 235 eo_del (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 500db014ab..bc03214118 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -175,7 +175,7 @@ _item_del_cb(void *data,
175 elm_layout_signal_emit(obj, buf, "elm"); 175 elm_layout_signal_emit(obj, buf, "elm");
176 176
177 VIEW(it) = NULL; 177 VIEW(it) = NULL;
178 eo_unref(EO_OBJ(it)); 178 eo_del(EO_OBJ(it));
179 179
180 elm_layout_sizing_eval(obj); 180 elm_layout_sizing_eval(obj);
181 break; 181 break;
@@ -261,7 +261,7 @@ _elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item
261 int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), buf), content); 261 int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), buf), content);
262 if (!int_ret) 262 if (!int_ret)
263 { 263 {
264 eo_unref(eo_it); 264 eo_del(eo_it);
265 return EINA_FALSE; 265 return EINA_FALSE;
266 } 266 }
267 267
@@ -337,7 +337,7 @@ _elm_dayselector_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *it
337 elm_layout_signal_emit(obj, buf, "elm"); 337 elm_layout_signal_emit(obj, buf, "elm");
338 338
339 VIEW(it) = NULL; 339 VIEW(it) = NULL;
340 eo_unref(EO_OBJ(it)); 340 eo_del(EO_OBJ(it));
341 341
342 elm_layout_sizing_eval(obj); 342 elm_layout_sizing_eval(obj);
343 343
@@ -444,7 +444,7 @@ _elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
444 { 444 {
445 sd->items = eina_list_remove(sd->items, it); 445 sd->items = eina_list_remove(sd->items, it);
446 eina_stringshare_del(it->day_style); 446 eina_stringshare_del(it->day_style);
447 eo_unref(EO_OBJ(it)); 447 eo_del(EO_OBJ(it));
448 } 448 }
449 449
450 /* handles freeing sd */ 450 /* handles freeing sd */
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 8e5c0d1ac3..249a26e8a1 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_unref(EO_OBJ(it)); 1134 eo_del(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_unref(EO_OBJ(sd->last)); 1365 eo_del(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_unref(EO_OBJ(sd->s_last)); 1372 eo_del(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_unref(EO_OBJ(sd->second)); 1379 eo_del(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_unref(EO_OBJ(sd->first)); 1386 eo_del(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_unref(EO_OBJ(it)); 1395 eo_del(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_unref(EO_OBJ(it)); 1405 eo_del(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_unref(EO_OBJ(it)); 1412 eo_del(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_unref(EO_OBJ(it)); 1639 eo_del(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 0f73473b52..ef49a484e7 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4082,7 +4082,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
4082 if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next); 4082 if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next);
4083 if (itn) itn->walking++; /* prevent early death of subitem */ 4083 if (itn) itn->walking++; /* prevent early death of subitem */
4084 it->del_cb(it); 4084 it->del_cb(it);
4085 eo_unref(EO_OBJ(it)); 4085 eo_del(EO_OBJ(it));
4086 if (itn) itn->walking--; 4086 if (itn) itn->walking--;
4087 } 4087 }
4088 } 4088 }
@@ -4154,7 +4154,7 @@ _item_select(Elm_Gen_Item *it)
4154 if ((!it->walking) && (it->generation < sd->generation)) 4154 if ((!it->walking) && (it->generation < sd->generation))
4155 { 4155 {
4156 it->del_cb(it); 4156 it->del_cb(it);
4157 eo_unref(eo_it); 4157 eo_del(eo_it);
4158 sd->last_selected_item = NULL; 4158 sd->last_selected_item = NULL;
4159 } 4159 }
4160 } 4160 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 3ec4cab877..85a7341d72 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5861,7 +5861,7 @@ _item_select(Elm_Gen_Item *it)
5861item_deleted: 5861item_deleted:
5862 it->walking = -1; //This item was removed from it's item list. 5862 it->walking = -1; //This item was removed from it's item list.
5863 _item_del(it); 5863 _item_del(it);
5864 eo_unref(eo_it); 5864 eo_del(eo_it);
5865 evas_object_unref(obj); 5865 evas_object_unref(obj);
5866 return EINA_TRUE; 5866 return EINA_TRUE;
5867} 5867}
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 5706b895f4..a11baae2dd 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -672,7 +672,7 @@ _elm_list_deletions_process(Elm_List_Data *sd)
672 672
673 /* issuing free because of "locking" item del pre hook */ 673 /* issuing free because of "locking" item del pre hook */
674 _elm_list_item_free(it); 674 _elm_list_item_free(it);
675 eo_unref(EO_OBJ(it)); 675 eo_del(EO_OBJ(it));
676 } 676 }
677 677
678 sd->walking--; 678 sd->walking--;
@@ -2489,7 +2489,7 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
2489 /* issuing free because of "locking" item del pre hook */ 2489 /* issuing free because of "locking" item del pre hook */
2490 _elm_list_item_free(it); 2490 _elm_list_item_free(it);
2491 WIDGET(it) = NULL; 2491 WIDGET(it) = NULL;
2492 eo_unref(eo_it); 2492 eo_del(eo_it);
2493 } 2493 }
2494 2494
2495 _elm_list_unwalk(obj, sd); 2495 _elm_list_unwalk(obj, sd);
@@ -2750,7 +2750,7 @@ _elm_list_clear(Eo *obj, Elm_List_Data *sd)
2750 ELM_LIST_ITEM_DATA_GET(eo_it, it); 2750 ELM_LIST_ITEM_DATA_GET(eo_it, it);
2751 /* issuing free because of "locking" item del pre hook */ 2751 /* issuing free because of "locking" item del pre hook */
2752 _elm_list_item_free(it); 2752 _elm_list_item_free(it);
2753 eo_unref(eo_it); 2753 eo_del(eo_it);
2754 } 2754 }
2755 2755
2756 _elm_list_unwalk(obj, sd); 2756 _elm_list_unwalk(obj, sd);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 86ffd926c0..e9339a0248 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_unref(eo_item); 57 eo_del(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 b1a26b518e..d77b93227a 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_unref(eo_it); 636 eo_del(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 98d0931294..c3d5879ab7 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_unref(eo_item); 646 eo_del(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 1cb69c2cd9..c58659a1a3 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_unref(sd->servers[i]); 158 eo_del(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_unref(manager); 226 eo_del(manager);
227 } 227 }
228} 228}
229 229
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 35d9163bd9..d42d26ca06 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -4575,7 +4575,7 @@ _elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
4575 Eina_Bool del_ok; 4575 Eina_Bool del_ok;
4576 del_ok = elm_wdg_item_del_pre(item->eo_obj); 4576 del_ok = elm_wdg_item_del_pre(item->eo_obj);
4577 if (del_ok) 4577 if (del_ok)
4578 eo_unref(item->eo_obj); 4578 eo_del(item->eo_obj);
4579 return; 4579 return;
4580} 4580}
4581 4581
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 61af39bc1b..4e5120de45 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -861,6 +861,7 @@ EAPI int eo_ref_get(const Eo *obj);
861 * 861 *
862 * @see eo_del_intercept_get() 862 * @see eo_del_intercept_get()
863 * @see eo_unref() 863 * @see eo_unref()
864 * @see eo_del()
864 */ 865 */
865EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func); 866EAPI void eo_del_intercept_set(Eo *obj, Eo_Del_Intercept del_intercept_func);
866 867
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 8ff5f4ac27..2797d1ae8d 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -718,7 +718,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
718 718
719 /* We have two refs at this point. */ 719 /* We have two refs at this point. */
720 _eo_unref(obj); 720 _eo_unref(obj);
721 _eo_unref(obj); 721 eo_del((Eo *) obj->header.id);
722 return NULL; 722 return NULL;
723 } 723 }
724 else if (eo_id != _eo_obj_id_get(obj)) 724 else if (eo_id != _eo_obj_id_get(obj))
@@ -776,7 +776,7 @@ _eo_add_internal_end(Eo *eo_id, Eo *finalized_id)
776 776
777cleanup: 777cleanup:
778 _eo_unref(obj); 778 _eo_unref(obj);
779 _eo_unref(obj); 779 eo_del((Eo *) obj->header.id);
780 return NULL; 780 return NULL;
781} 781}
782 782
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 8d0de471c6..5ce07d8083 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -73,6 +73,15 @@ 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 }
76 @property name { 85 @property name {
77 [[ The name of the object. 86 [[ The name of the object.
78 87
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 1743695019..5d8601b91d 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -465,6 +465,19 @@ _eo_base_comment_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd)
465} 465}
466 466
467EOLIAN static void 467EOLIAN static void
468_eo_base_del(const Eo *obj, Eo_Base_Data *pd EINA_UNUSED)
469{
470 if (eo_parent_get((Eo *) obj))
471 {
472 eo_parent_set((Eo *) obj, NULL);
473 }
474 else
475 {
476 eo_unref(obj);
477 }
478}
479
480EOLIAN static void
468_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id) 481_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
469{ 482{
470 if (pd->parent == parent_id) 483 if (pd->parent == parent_id)
@@ -1433,6 +1446,7 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
1433 1446
1434 if (pd->parent) 1447 if (pd->parent)
1435 { 1448 {
1449 ERR("Object '%p' still has a parent at the time of destruction.", obj);
1436 eo_parent_set(obj, NULL); 1450 eo_parent_set(obj, NULL);
1437 } 1451 }
1438 1452
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index dc4167fe78..e799773df4 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_unref(o->file_obj); 626 eo_del(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 cc9b395dc5..897192ebd6 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_unref(o->file_obj); 587 eo_del(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_unref(o->file_obj); 667 eo_del(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 740413ae56..bb192b9868 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_unref(o->file_obj); 265 eo_del(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_unref(o->file_obj); 1432 eo_del(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 661a16cda5..e3ac031e5f 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_unref(eo_obj); 738 eo_del(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 3c44b914f6..5f17c8b7af 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -292,7 +292,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
292 292
293 if (pd->renderer) 293 if (pd->renderer)
294 { 294 {
295 eo_unref(pd->renderer); 295 eo_del(pd->renderer);
296 pd->renderer = NULL; 296 pd->renderer = NULL;
297 } 297 }
298 if (pd->intp) 298 if (pd->intp)
@@ -675,7 +675,7 @@ _efl_vg_interpolate(Eo *obj,
675 tod = eo_data_scope_get(to, EFL_VG_CLASS); 675 tod = eo_data_scope_get(to, EFL_VG_CLASS);
676 from_map = 1.0 - pos_map; 676 from_map = 1.0 - pos_map;
677 677
678 eo_unref(pd->renderer); 678 eo_del(pd->renderer);
679 pd->renderer = NULL; 679 pd->renderer = NULL;
680 680
681 if (fromd->m || tod->m) 681 if (fromd->m || tod->m)
@@ -765,7 +765,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
765 765
766 if (pd->renderer) 766 if (pd->renderer)
767 { 767 {
768 eo_unref(pd->renderer); 768 eo_del(pd->renderer);
769 pd->renderer = NULL; 769 pd->renderer = NULL;
770 } 770 }
771 771
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index 1bb6609cd8..fef55f492d 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_unref(fb->buffer); 93 eo_del(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 11a5530320..ca8d83950b 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_unref(ector); 2493 if (ector) eo_del(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 40c084aea0..f67e6946cb 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4065,7 +4065,7 @@ eng_ector_create(void *data EINA_UNUSED)
4065static void 4065static void
4066eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector) 4066eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector)
4067{ 4067{
4068 if (ector) eo_unref(ector); 4068 if (ector) eo_del(ector);
4069} 4069}
4070 4070
4071static Ector_Buffer * 4071static Ector_Buffer *
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 2174f9a24c..480e5a2b8b 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_unref(out); 86 eo_del(out);
87 eo_unref(in); 87 eo_del(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_unref(in); 103 eo_del(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_unref(in); 221 eo_del(in);
222 eo_unref(out); 222 eo_del(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_unref(in); 311 eo_del(in);
312 eo_unref(out); 312 eo_del(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_unref(in2); 364 eo_del(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_unref(out); 371 eo_del(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_unref(in); 377 eo_del(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_unref(out); 436 eo_del(out);
437 eo_unref(in); 437 eo_del(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_unref(in); 536 eo_del(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_unref(obj); 584 eo_del(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 2b2b47a594..2de5f147b7 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -705,7 +705,7 @@ START_TEST(edje_test_table_eoapi)
705 fail_if(!efl_pack_clear(proxy)); 705 fail_if(!efl_pack_clear(proxy));
706 fail_if(efl_content_count(efl_part(obj, "table2")) != 1); 706 fail_if(efl_content_count(efl_part(obj, "table2")) != 1);
707 fail_if(efl_content_count(proxy) != 4); 707 fail_if(efl_content_count(proxy) != 4);
708 eo_unref(proxy); 708 eo_del(proxy);
709 709
710 EDJE_TEST_FREE_EVAS(); 710 EDJE_TEST_FREE_EVAS();
711} 711}
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 2b39efc554..82c1564e37 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_unref(g_bg); 441 eo_del(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 83937428c3..86a0cbb93e 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_unref(o); 100 eo_del(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 ba6f6a285e..9d30277333 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_unref(child2); 43 eo_del(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_unref(child1); 55 eo_del(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_unref(child3); 65 eo_del(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 8533b3105e..12c478f454 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_unref(obj); 84 eo_del(obj);
85 eo_unref(obj); 85 eo_del(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 055bd3c12a..ddbe0987cc 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -378,11 +378,11 @@ START_TEST(eo_composite_tests)
378 fail_if(!eo_composite_part_is(obj2)); 378 fail_if(!eo_composite_part_is(obj2));
379 379
380 /* Check that a deletion of a child detaches from the parent. */ 380 /* Check that a deletion of a child detaches from the parent. */
381 eo_unref(obj2); 381 eo_del(obj2);
382 fail_if(!eo_composite_attach(obj3, obj)); 382 fail_if(!eo_composite_attach(obj3, obj));
383 383
384 /* Check that a deletion of the parent detaches the child. */ 384 /* Check that a deletion of the parent detaches the child. */
385 eo_unref(obj3); 385 eo_del(obj3);
386 fail_if(eo_composite_part_is(obj)); 386 fail_if(eo_composite_part_is(obj));
387 387
388 eo_unref(obj); 388 eo_unref(obj);
@@ -582,9 +582,9 @@ START_TEST(eo_refs)
582 ck_assert_int_eq(eo_ref_get(obj2), 1); 582 ck_assert_int_eq(eo_ref_get(obj2), 1);
583 ck_assert_int_eq(eo_ref_get(obj3), 1); 583 ck_assert_int_eq(eo_ref_get(obj3), 1);
584 584
585 eo_unref(obj); 585 eo_del(obj);
586 eo_unref(obj2); 586 eo_del(obj2);
587 eo_unref(obj3); 587 eo_del(obj3);
588 588
589 /* Just check it doesn't seg atm. */ 589 /* Just check it doesn't seg atm. */
590 obj = eo_add(SIMPLE_CLASS, NULL); 590 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -596,7 +596,7 @@ START_TEST(eo_refs)
596 obj2 = eo_add(SIMPLE_CLASS, obj); 596 obj2 = eo_add(SIMPLE_CLASS, obj);
597 eo_unref(obj2); 597 eo_unref(obj2);
598 eo_ref(obj2); 598 eo_ref(obj2);
599 eo_unref(obj2); 599 eo_del(obj2);
600 eo_unref(obj); 600 eo_unref(obj);
601 601
602 eo_shutdown(); 602 eo_shutdown();
@@ -811,6 +811,7 @@ START_TEST(eo_magic_checks)
811 811
812 eo_ref((Eo *) buf); 812 eo_ref((Eo *) buf);
813 eo_unref((Eo *) buf); 813 eo_unref((Eo *) buf);
814 eo_del((Eo *) buf);
814 815
815 eo_isa((Eo *) buf, SIMPLE_CLASS); 816 eo_isa((Eo *) buf, SIMPLE_CLASS);
816 eo_isa(obj, (Eo_Class *) buf); 817 eo_isa(obj, (Eo_Class *) buf);
@@ -1125,7 +1126,7 @@ START_TEST(eo_del_intercept)
1125 fail_if(!obj); 1126 fail_if(!obj);
1126 fail_if(!eo_isa(obj, klass)); 1127 fail_if(!eo_isa(obj, klass));
1127 eo_del_intercept_set(obj, _del_intercept); 1128 eo_del_intercept_set(obj, _del_intercept);
1128 eo_unref(obj); 1129 eo_del(obj);
1129 fail_if(!intercepted); 1130 fail_if(!intercepted);
1130 fail_if(eo_isa(obj, klass)); 1131 fail_if(eo_isa(obj, klass));
1131 1132
@@ -1185,7 +1186,7 @@ START_TEST(eo_name)
1185 objtmp = eo_name_find(obj, "*mple:joe"); 1186 objtmp = eo_name_find(obj, "*mple:joe");
1186 fail_if(objtmp != obj2); 1187 fail_if(objtmp != obj2);
1187 1188
1188 eo_unref(obj); 1189 eo_del(obj);
1189 1190
1190 eo_shutdown(); 1191 eo_shutdown();
1191} 1192}
@@ -1215,7 +1216,7 @@ START_TEST(eo_comment)
1215 comment = eo_comment_get(obj); 1216 comment = eo_comment_get(obj);
1216 fail_if(NULL != comment); 1217 fail_if(NULL != comment);
1217 1218
1218 eo_unref(obj); 1219 eo_del(obj);
1219 1220
1220 eo_shutdown(); 1221 eo_shutdown();
1221} 1222}
@@ -1232,7 +1233,7 @@ START_TEST(eo_rec_interface)
1232 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS); 1233 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS);
1233 fail_if(objtmp != s); 1234 fail_if(objtmp != s);
1234 1235
1235 eo_unref(obj); 1236 eo_del(obj);
1236 1237
1237 eo_shutdown(); 1238 eo_shutdown();
1238} 1239}
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 1408525dc4..7f90754872 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_unref(o); 641 eo_del(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_unref(o); 645 eo_del(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_unref(o); 650 eo_del(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 9dea211c04..aba8a0bfc8 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_unref(mesh2); \ 68 eo_del(mesh2); \
69 eo_unref(mesh); \ 69 eo_del(mesh); \
70 unlink(buffer); \ 70 unlink(buffer); \
71 } 71 }
72 72