forked from enlightenment/efl
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.
bc6b6aa457
is the relevant EFL commit.
This commit is contained in:
parent
045ad420cd
commit
236bab8d53
|
@ -286,7 +286,7 @@ _win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_
|
|||
{
|
||||
Elm_App_Client *app;
|
||||
EINA_LIST_FREE(apps_list, app)
|
||||
eo_unref(app);
|
||||
eo_del(app);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -3248,7 +3248,7 @@ _elm_atspi_bridge_shutdown(void)
|
|||
{
|
||||
if (_init_count)
|
||||
{
|
||||
eo_unref(_root);
|
||||
eo_del(_root);
|
||||
|
||||
if (_cache_update_idler)
|
||||
ecore_idler_del(_cache_update_idler);
|
||||
|
|
|
@ -3582,7 +3582,6 @@ EOLIAN static void
|
|||
_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
|
||||
{
|
||||
elm_gengrid_clear(obj);
|
||||
eo_unref(sd->pan_obj);
|
||||
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
|
||||
ELM_SAFE_FREE(sd->stack, evas_object_del);
|
||||
|
||||
|
|
|
@ -5343,7 +5343,6 @@ _elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
|
|||
elm_genlist_clear(obj);
|
||||
for (i = 0; i < 2; i++)
|
||||
ELM_SAFE_FREE(sd->stack[i], evas_object_del);
|
||||
eo_unref(sd->pan_obj);
|
||||
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
|
||||
|
||||
_item_cache_zero(sd);
|
||||
|
|
|
@ -4159,7 +4159,6 @@ _elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
|
|||
ecore_timer_del(sd->loaded_timer);
|
||||
if (sd->map) evas_map_free(sd->map);
|
||||
|
||||
eo_unref(sd->pan_obj);
|
||||
evas_object_del(sd->pan_obj);
|
||||
sd->pan_obj = NULL;
|
||||
|
||||
|
|
|
@ -1367,7 +1367,6 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
|
|||
free(g->grid);
|
||||
free(g);
|
||||
}
|
||||
eo_unref(sd->pan_obj);
|
||||
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
|
||||
|
||||
if (sd->f) eina_file_close(sd->f);
|
||||
|
|
Loading…
Reference in New Issue