elementary/naviframe - dont' be popped if the event is freezed and popping is going on.

commit 8fb591b0590f8bf188e63aff4cb293caad54a343
Author: ChunEon Park <hermet>@hermet.pe.kr>
Date: Sun Jun 16 19:57:19 2013 +0900

Change-Id: Icb32560e6e3cf6347b166c10ef38266c2bda4460

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 8840611..9f3f1c2 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1275,7 +1275,6 @@ _elm_naviframe_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__,
    if (!it) return;
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-   if (sd->freeze_events && sd->popping) return;
 
    elm_naviframe_item_pop(obj);
 }
@@ -1487,7 +1486,6 @@ _elm_naviframe_smart_event(Evas_Object *obj,
    if (!it) return EINA_FALSE;
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-   if (sd->freeze_events && sd->popping) return EINA_TRUE;
 
    if (it->title_prev_btn)
     evas_object_smart_callback_call(it->title_prev_btn, SIG_CLICKED, NULL);
@@ -1741,6 +1739,8 @@ elm_naviframe_item_pop(Evas_Object *obj)
    ELM_NAVIFRAME_CHECK(obj) NULL;
    ELM_NAVIFRAME_DATA_GET(obj, sd);
 
+   if (sd->freeze_events && sd->popping) return NULL;
+
    it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
    if (!it) return NULL;