diff options
| author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2013-04-02 12:44:27 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2013-04-02 12:44:27 +0900 |
| commit | 958ace6411cac912b09d760e50f46c35e6303e40 (patch) | |
| tree | ca9b58ebc459c8eb203b9cbf6e7277b4f40c5189 | |
| parent | 00789404fa386e86c596ac6ea10adbaef72e1a7b (diff) | |
| download | elementary-devs/jackdanielz/eo_data_ref.tar.gz | |
gengrid/genlist: removed relcount leftovers from commit 3f4c3e03c600c87782543cf08de886016f2c192e.devs/jackdanielz/eo_data_ref
| -rw-r--r-- | src/lib/elm_gen_common.h | 1 | ||||
| -rw-r--r-- | src/lib/elm_gengrid.c | 11 | ||||
| -rw-r--r-- | src/lib/elm_genlist.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h index f376956fe..568e1fc41 100644 --- a/src/lib/elm_gen_common.h +++ b/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/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 3bd26e2ef..57b8d78e6 100644 --- a/src/lib/elm_gengrid.c +++ b/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/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 7ea45587a..47c05db5f 100644 --- a/src/lib/elm_genlist.c +++ b/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) |