From 56fce12f7704493d54bf2b402027d901e95bf195 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 14 Nov 2012 10:49:49 +0000 Subject: [PATCH] elm test_index.c: 1. do not need to call elm_list_selected_item_get(). event_info is a selected item. 2. check index item before using it. SVN revision: 79282 --- legacy/elementary/src/bin/test_index.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/legacy/elementary/src/bin/test_index.c b/legacy/elementary/src/bin/test_index.c index ad6bc51b2a..a24e447f2a 100644 --- a/legacy/elementary/src/bin/test_index.c +++ b/legacy/elementary/src/bin/test_index.c @@ -289,16 +289,13 @@ test_index2_it_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __U } void -test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) +test_index2_it_del(void *data, Evas_Object *obj __UNUSED__, void *event_info) { Test_Index2_Elements *gui = data; const char *label, *label_next; - Elm_Object_Item *list_it, *list_it_next; - Elm_Object_Item *iit; + Elm_Object_Item *list_it = event_info, *list_it_next, *iit; - list_it = elm_list_selected_item_get(obj); list_it_next = elm_list_item_next(list_it); - if (!list_it_next) { iit = elm_index_item_find(gui->id, list_it); @@ -311,10 +308,13 @@ test_index2_it_del(void *data, Evas_Object *obj, void *event_info __UNUSED__) label_next = elm_object_item_text_get(list_it_next); iit = elm_index_item_find(gui->id, list_it); - if (label[0] == label_next[0]) - elm_object_item_data_set(iit, list_it_next); - else - elm_object_item_del(iit); + if (iit) + { + if (label[0] == label_next[0]) + elm_object_item_data_set(iit, list_it_next); + else + elm_object_item_del(iit); + } elm_object_item_del(list_it); }