From: prince Date: Tue, 16 Apr 2013 12:19:18 +0000 (+0530) Subject: [Elm_genlist] Added check in order to avoid unnecessary error/warning. X-Git-Tag: 2.1b_release~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64a3cd4ffb03bcda0287bcd7dd7076a7aec45793;p=framework%2Fuifw%2Felementary.git [Elm_genlist] Added check in order to avoid unnecessary error/warning. Change-Id: I236f8c6d0df7cf733bb0a76021860c316432b924 Conflicts: src/lib/elm_genlist.c --- diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index e74e424..9acb5e1 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -581,7 +581,10 @@ _item_unrealize(Elm_Gen_Item *it, //Forcing the edje signal process for item's content. EINA_LIST_FOREACH(it->content_objs, l, content) - edje_object_message_signal_process(elm_layout_edje_get(content)); + { + if (evas_object_smart_type_check(content, "elm_layout")) + edje_object_message_signal_process(elm_layout_edje_get(content)); + } // Free view item EINA_LIST_FOREACH(it->texts, l, part) @@ -7563,7 +7566,7 @@ elm_genlist_pinch_zoom_mode_set(Evas_Object *obj, Elm_Gen_Pinch_Zoom_Mode mode) Elm_Gen_Item *it; Eina_Bool done = EINA_FALSE; - if ((sd->queue) || (!sd->rendered) + if ((sd->queue) || (!sd->rendered) || (sd->queue_idle_enterer) || (!sd->fx_mode)) return EINA_FALSE; EINA_INLIST_FOREACH(sd->blocks, itb)