summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-11-23 09:18:42 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-11-23 09:18:42 +0200
commit7395086725fd19ea93353319e49b3afe1535e799 (patch)
treef0c0574e31b3bf3918bceb1eb83275e9d84b184c
parentdb5dd5f7d3fa532c68eb57090eebd6e4f0c339cb (diff)
Genlist: Fix previous commit.
The items of an item is a list of Elm_Object_Item and not of Elm_Gen_Item. Sorry @zmike ;-) Fixes T1859 Another fix has been added in this commit, related to relative items.
-rw-r--r--src/lib/elm_genlist.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 4cd9c224c..39a813a86 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3426,7 +3426,7 @@ _item_del(Elm_Gen_Item *it)
3426 evas_event_freeze(evas_object_evas_get(obj)); 3426 evas_event_freeze(evas_object_evas_get(obj));
3427 3427
3428 // FIXME: relative will be better to be fixed. it is too harsh. 3428 // FIXME: relative will be better to be fixed. it is too harsh.
3429 if (it->item->rel) 3429 if (it->item->rel && it->item->rel->item)
3430 it->item->rel->item->rel_revs = 3430 it->item->rel->item->rel_revs =
3431 eina_list_remove(it->item->rel->item->rel_revs, it); 3431 eina_list_remove(it->item->rel->item->rel_revs, it);
3432 if (it->item->rel_revs) 3432 if (it->item->rel_revs)
@@ -6069,6 +6069,7 @@ _elm_genlist_item_sorted_insert(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, const
6069 6069
6070 if (it->parent) 6070 if (it->parent)
6071 { 6071 {
6072 Elm_Object_Item *eo_rel = NULL;
6072 Eina_List *l; 6073 Eina_List *l;
6073 int cmp_result; 6074 int cmp_result;
6074 6075
@@ -6078,7 +6079,8 @@ _elm_genlist_item_sorted_insert(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, const
6078 6079
6079 if (l) 6080 if (l)
6080 { 6081 {
6081 rel = eina_list_data_get(l); 6082 eo_rel = eina_list_data_get(l);
6083 rel = eo_data_scope_get(eo_rel, ELM_GENLIST_ITEM_CLASS);
6082 6084
6083 if (cmp_result >= 0) 6085 if (cmp_result >= 0)
6084 { 6086 {