merge with r69788 for fixing timer_del problem in genlist

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 8a56b10..a91e2d4 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -890,7 +890,11 @@ _item_del(Elm_Gen_Item *it)
    if (it->wd->expanded_next_item == it) it->wd->expanded_next_item = NULL;
    if (it->parent)
      it->parent->item->items = eina_list_remove(it->parent->item->items, it);
-   if (it->item->swipe_timer) ecore_timer_del(it->item->swipe_timer);
+   if (it->item->swipe_timer)
+     {
+        ecore_timer_del(it->item->swipe_timer);
+        it->item->swipe_timer = NULL;
+     }
    _elm_genlist_item_del_serious(it);
    elm_genlist_item_class_unref((Elm_Genlist_Item_Class *)it->itc);
    evas_event_thaw(evas_object_evas_get(obj));