summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-09-30 14:53:17 +0100
committerTom Hacohen <tom@stosb.com>2014-09-30 14:54:52 +0100
commitfdde19d5ee8f570a9cda1954badaa417f0e410c8 (patch)
tree49d932f78bbe7f8fe5ef5998f910fb991980f746
parent496b4a39cbb630e6658dfa7f56edc880993dcf69 (diff)
Change according to recent Eo changes, and fix related wrong unrefs.
eo_add()'s counterpart is eo_del, not eo_unref. Regardless of that, some objects were being double-deleted which spew out some eo errors. These things should now be fixed. bc6b6aa457be1325caa5cb86a0a9e166cbb5a7cb is the relevant EFL commit.
-rw-r--r--src/bin/test_task_switcher.c2
-rw-r--r--src/lib/elm_atspi_bridge.c2
-rw-r--r--src/lib/elm_gengrid.c1
-rw-r--r--src/lib/elm_genlist.c1
-rw-r--r--src/lib/elm_map.c1
-rw-r--r--src/lib/elm_photocam.c1
6 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c
index 93bbe5562..a0e14dd0a 100644
--- a/src/bin/test_task_switcher.c
+++ b/src/bin/test_task_switcher.c
@@ -286,7 +286,7 @@ _win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_
286{ 286{
287 Elm_App_Client *app; 287 Elm_App_Client *app;
288 EINA_LIST_FREE(apps_list, app) 288 EINA_LIST_FREE(apps_list, app)
289 eo_unref(app); 289 eo_del(app);
290} 290}
291 291
292static void 292static void
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index 959441484..cba44ba2d 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -3248,7 +3248,7 @@ _elm_atspi_bridge_shutdown(void)
3248{ 3248{
3249 if (_init_count) 3249 if (_init_count)
3250 { 3250 {
3251 eo_unref(_root); 3251 eo_del(_root);
3252 3252
3253 if (_cache_update_idler) 3253 if (_cache_update_idler)
3254 ecore_idler_del(_cache_update_idler); 3254 ecore_idler_del(_cache_update_idler);
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index b2c33f690..9896479e8 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3582,7 +3582,6 @@ EOLIAN static void
3582_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd) 3582_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
3583{ 3583{
3584 elm_gengrid_clear(obj); 3584 elm_gengrid_clear(obj);
3585 eo_unref(sd->pan_obj);
3586 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 3585 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
3587 ELM_SAFE_FREE(sd->stack, evas_object_del); 3586 ELM_SAFE_FREE(sd->stack, evas_object_del);
3588 3587
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index dd2eeb213..cabe17ed8 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5343,7 +5343,6 @@ _elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
5343 elm_genlist_clear(obj); 5343 elm_genlist_clear(obj);
5344 for (i = 0; i < 2; i++) 5344 for (i = 0; i < 2; i++)
5345 ELM_SAFE_FREE(sd->stack[i], evas_object_del); 5345 ELM_SAFE_FREE(sd->stack[i], evas_object_del);
5346 eo_unref(sd->pan_obj);
5347 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 5346 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
5348 5347
5349 _item_cache_zero(sd); 5348 _item_cache_zero(sd);
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 2bd787e57..6d28fbdfc 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4159,7 +4159,6 @@ _elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
4159 ecore_timer_del(sd->loaded_timer); 4159 ecore_timer_del(sd->loaded_timer);
4160 if (sd->map) evas_map_free(sd->map); 4160 if (sd->map) evas_map_free(sd->map);
4161 4161
4162 eo_unref(sd->pan_obj);
4163 evas_object_del(sd->pan_obj); 4162 evas_object_del(sd->pan_obj);
4164 sd->pan_obj = NULL; 4163 sd->pan_obj = NULL;
4165 4164
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 1fb3c10cc..efeca6697 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1367,7 +1367,6 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
1367 free(g->grid); 1367 free(g->grid);
1368 free(g); 1368 free(g);
1369 } 1369 }
1370 eo_unref(sd->pan_obj);
1371 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 1370 ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
1372 1371
1373 if (sd->f) eina_file_close(sd->f); 1372 if (sd->f) eina_file_close(sd->f);