From 7841978a6f6f150244991fe4e9b55c49efc1074c Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Wed, 17 Apr 2013 22:53:54 +0900 Subject: [PATCH] [access] Fix the widget which uses elm_scroller can be scrolled. Change-Id: I1fae28718f3bf91edeb57415a4c293707f2c560d --- src/lib/elc_naviframe.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index d3ddfbd..b152017 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -563,8 +563,6 @@ _item_title_prev_btn_set(Elm_Naviframe_Item *it, elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm"); evas_object_event_callback_add (btn, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb, it); -<<<<<<< HEAD -======= evas_object_smart_callback_add (btn, SIG_CLICKED, _on_item_back_btn_clicked, WIDGET(it)); @@ -576,7 +574,6 @@ _item_title_prev_btn_set(Elm_Naviframe_Item *it, _elm_access_callback_set (_elm_access_object_get(btn), ELM_ACCESS_INFO, _access_prev_btn_info_cb, it); ->>>>>>> ea5fd05... [naviframe][access] set access info callback for prev button properly } static void -- 2.7.4