summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-01-14 14:41:50 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-01-14 14:41:50 -0500
commit99581d48343247b25ec435687109e2516dfb5b29 (patch)
treed5ec3b062d07bdceeedd544f7ca7fdf0ec29a861
parentc80b24baf815e35c160bf0dbe8ecae6ea247aef8 (diff)
Revert "genlist: fix a crash when deleting a item in selected callback."
This reverts commit c80b24baf815e35c160bf0dbe8ecae6ea247aef8. this broke the selection callback completely and makes every genlist app unusable. please, please, please, please, I'm seriously begging you hermet, do ANY amount of testing before making further genlist commits.
-rw-r--r--src/lib/elm_genlist.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 81d6246ab..a4ebbf89b 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5669,6 +5669,9 @@ _item_select(Elm_Gen_Item *it)
5669 eina_list_append(sd->selected, eo_it); 5669 eina_list_append(sd->selected, eo_it);
5670 } 5670 }
5671 5671
5672 evas_object_ref(obj);
5673 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
5674 evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
5672 elm_object_item_focus_set(eo_it, EINA_TRUE); 5675 elm_object_item_focus_set(eo_it, EINA_TRUE);
5673 _elm_genlist_item_content_focus_set(it, ELM_FOCUS_PREVIOUS); 5676 _elm_genlist_item_content_focus_set(it, ELM_FOCUS_PREVIOUS);
5674 5677
@@ -5689,12 +5692,6 @@ _item_select(Elm_Gen_Item *it)
5689 } 5692 }
5690 } 5693 }
5691 5694
5692 evas_object_ref(obj);
5693
5694 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
5695 if (EINA_MAGIC_CHECK((Elm_Widget_Item_Data *)it, ELM_WIDGET_ITEM_MAGIC))
5696 evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
5697
5698 evas_object_unref(obj); 5695 evas_object_unref(obj);
5699} 5696}
5700 5697