Revert "Build break fix"
authorJihoon Chung <jihoon.chung@samsung.com>
Thu, 13 Jun 2013 08:05:43 +0000 (08:05 +0000)
committerHoseon LEE <hoseon46.lee@samsung.com>
Sun, 29 Sep 2013 05:35:16 +0000 (14:35 +0900)
This reverts commit 3289bb084e10603ef98dfc135779957a21dd1e10

Change-Id: I3b921aff621e26b2fffc5dac0a23dbdef03457c7

src/wrt-client/window_data.h
src/wrt-client/wrt-client.cpp
src/wrt-client/wrt-client.h

index 720b9bf..0c1008b 100644 (file)
@@ -47,7 +47,7 @@ class WindowData : private DPL::Noncopyable
         void* data, Evas_Object* obj, void* event_info);
     typedef void (*EvasCallbackType)(
         void* data, Evas* evas, Evas_Object* obj, void* event_info);
-    typedef void (*NaviframePopCallbackType)(
+    typedef Eina_Bool (*NaviframePopCallbackType)(
         void* data, Elm_Object_Item* it);
 
     struct EventWithFunction
index ce5ebbb..36f415a 100644 (file)
@@ -645,14 +645,15 @@ void WrtClient::backButtonCallback(void* data,
     This->m_widget->Backward();
 }
 
-void WrtClient::naviframeBackButtonCallback(void* data,
-                                            Elm_Object_Item* it)
+Eina_Bool WrtClient::naviframeBackButtonCallback(void* data,
+                                                 Elm_Object_Item* it)
 {
     LogInfo("BackButtonCallback");
     Assert(data);
 
     WrtClient* This = static_cast<WrtClient*>(data);
     This->m_widget->Backward();
+    return EINA_FALSE;
 }
 
 int WrtClient::appcoreLowMemoryCallback(void* /*data*/)
index 51549ba..11f02c8 100644 (file)
@@ -83,8 +83,10 @@ class WrtClient :
     static void backButtonCallback(void* data,
                                    Evas_Object* obj,
                                    void* event_info);
-    static void naviframeBackButtonCallback(void* data,
-                                            Elm_Object_Item* it);
+    static Eina_Bool naviframeBackButtonCallback(void* data,
+                                                 Elm_Object_Item* it);
+
+    // Low Memory Callback
     static int appcoreLowMemoryCallback(void* data);
     static int languageChangedCallback(void *data);