gengrid/genlist: removed relcount leftovers from commit 3f4c3e03c600c87782543cf08de88...

diff --git a/legacy/elementary/src/lib/elm_gen_common.h b/legacy/elementary/src/lib/elm_gen_common.h
index f376956..568e1fc 100644 (file)
--- a/legacy/elementary/src/lib/elm_gen_common.h
+++ b/legacy/elementary/src/lib/elm_gen_common.h
@@ -36,7 +36,6 @@ struct Elm_Gen_Item
    Elm_Gen_Item             *parent;
    Eina_List                *texts, *contents, *states, *content_objs;
    Ecore_Timer              *long_timer;
-   int                       relcount;
    int                       walking;
    int                       generation; /**< a generation of an item. when the item is created, this value is set to the value of genlist generation. this value will be decreased when the item is going to be deleted */
    const char               *mouse_cursor;

diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 3bd26e2..57b8d78 100644 (file)
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -2028,7 +2028,7 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it)
    it->generation = GG_IT(it)->wsd->generation - 1; /* This means that the
                                                      * item is deleted */
 
-   if ((it->relcount > 0) || (it->walking > 0)) return;
+   if (it->walking > 0) return;
 
    if (it->selected)
      GG_IT(it)->wsd->selected =
@@ -2192,7 +2192,7 @@ _item_del_pre_hook(Elm_Object_Item *item)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)item;
 
-   if ((it->relcount > 0) || (it->walking > 0))
+   if (it->walking > 0)
      {
         _elm_gengrid_item_del_not_serious(it);
         return;
@@ -2319,11 +2319,8 @@ _item_select(Elm_Gen_Item *it)
      {
         if ((!it->walking) && (it->generation < GG_IT(it)->wsd->generation))
           {
-             if (!it->relcount)
-               {
-                  it->del_cb(it);
-                  elm_widget_item_free(it);
-               }
+             it->del_cb(it);
+             elm_widget_item_free(it);
           }
         else
           GG_IT(it)->wsd->last_selected_item = (Elm_Object_Item *)it;

diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 7ea4558..47c05db 100644 (file)
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -5125,7 +5125,7 @@ _item_del_pre_hook(Elm_Object_Item *item)
 {
    Elm_Gen_Item *it = (Elm_Gen_Item *)item;
 
-   if ((it->relcount > 0) || (it->walking > 0))
+   if (it->walking > 0)
      {
      // FIXME: relative will be better to be fixed. it is too harsh.
       if (it->item->rel)