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.

diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c
index 93bbe5562ada824094beaf2500d89abcea4aef48..a0e14dd0a91652b44edc9d4e1494440edae29dfd 100644 (file)
--- 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_
 {
    Elm_App_Client *app;
    EINA_LIST_FREE(apps_list, app)
-     eo_unref(app);
+     eo_del(app);
 }
 
 static void

diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index 9594414847de856c86f06c72d7e6cc5c77e42ab6..cba44ba2d7c1ab90915606ac876c7666fed8f94f 100644 (file)
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -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);

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index b2c33f6901988783b04eb34e0e661c91b4d289d8..9896479e89a94d929ce69031c4ca3e28dbc4293d 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -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);
 

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index dd2eeb21372b98d9205b71275f2014074ffc126c..cabe17ed8e0b456fac608740037afaa8adf7054c 100644 (file)
--- 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)
    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);

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 2bd787e573d92aa531a4538fd2c6ab9f6db4241a..6d28fbdfccfd987a1ef28255bc0f8f0e6a7df06f 100644 (file)
--- 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)
    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;
 

diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 1fb3c10cc8873c839a2036bcc2dda27e860cf28a..efeca669746381973d9b04b76658250a81febf68 100644 (file)
--- 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)
         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);