Fix Prevent issues

Change-Id: I219b171830347ed244330167230a15811ee993ad
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index b27526e..a35250e 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -1324,15 +1324,22 @@ unsigned int
 _EcoreEvas::GetActiveWindow(void)
 {
        Ecore_X_Window* pRoots = null;
+       Ecore_X_Window activeWin = 0;
        int num = 0;
 
        pRoots = ecore_x_window_root_list(&num);
-       Ecore_X_Atom activeAtom = ecore_x_atom_get("_NET_ACTIVE_WINDOW");
+       if (pRoots)
+       {
+               Ecore_X_Atom activeAtom = ecore_x_atom_get("_NET_ACTIVE_WINDOW");
+               int ret = ecore_x_window_prop_window_get(pRoots[0], activeAtom, &activeWin, 1);
 
-       Ecore_X_Window activeWin = 0;
-       ecore_x_window_prop_window_get(pRoots[0], activeAtom, &activeWin, 1);
+               free(pRoots);
 
-       free(pRoots);
+               if (ret < 0)
+               {
+                       return 0;                       
+               }
+       }
 
        return activeWin;
 }
@@ -1967,9 +1974,11 @@ _EcoreEvas::IsWindowVisible(const _Window& window)
        }
 }
 
+// [ToDo] Remove API
 void
 _EcoreEvas::SetQuickPanelScrollEnabled(const _Window& window, bool enable)
 {
+       /*
        _EflLayer* pLayer = GetEflLayer(window);
        SysTryReturnVoidResult(NID_UI, pLayer, E_INVALID_ARG, "[E_INVALID_ARG] The window doesn't have a elf layer.");
 
@@ -1992,11 +2001,14 @@ _EcoreEvas::SetQuickPanelScrollEnabled(const _Window& window, bool enable)
        }
 
        ecore_x_window_prop_card32_set(win, atomPanelScrollable, val, 3);
+       */
 }
 
+// [ToDo] Remove API
 bool
 _EcoreEvas::IsQuickPanelScrollEnabled(const _Window& window)
 {
+       /*
        _EflLayer* pLayer = GetEflLayer(window);
        SysTryReturn(NID_UI, pLayer, false, E_INVALID_ARG, "[E_INVALID_ARG] The window doesn't have a elf layer.");
 
@@ -2017,6 +2029,9 @@ _EcoreEvas::IsQuickPanelScrollEnabled(const _Window& window)
        {
                return true;
        }
+       */
+       
+       return true;
 }
 
 void

diff --git a/src/ui/FUi_UiManagerProxy.cpp b/src/ui/FUi_UiManagerProxy.cpp
index 7ed3921..04e5388 100644 (file)
--- a/src/ui/FUi_UiManagerProxy.cpp
+++ b/src/ui/FUi_UiManagerProxy.cpp
@@ -62,7 +62,8 @@ _UiManagerProxy::SetZOrderGroup(unsigned int window, int windowZOrderGroup)
        SysTryReturnResult(NID_UI, pMsg, E_OUT_OF_MEMORY, "Memory is insufficient.");
 
        SysLog(NID_UI, "IPC message(0x%x, %d) is sent.", window, windowZOrderGroup);
-       __pIpcClient->SendRequest(*pMsg.get());
+       result ret = __pIpcClient->SendRequest(*pMsg.get());
+       SysTryReturnResult(NID_UI, ret == E_SUCCESS, ret, "Propagating.");
        SysTryReturnResult(NID_UI, r == E_SUCCESS, E_PRIVILEGE_DENIED, "The application does not have the privilege to call this method.");
 
        return E_SUCCESS;

diff --git a/src/ui/inc/FUi_EcoreEvas.h b/src/ui/inc/FUi_EcoreEvas.h
index 05da4b0..2ea6293 100644 (file)
--- a/src/ui/inc/FUi_EcoreEvas.h
+++ b/src/ui/inc/FUi_EcoreEvas.h
@@ -133,8 +133,6 @@ public:
        result SetEventPropagation(const _Control& control, bool enable);
        result SetFocus(const _Control& control, bool focus);
 
-       void SetQuickPanelScrollEnabled(const _Window& window, bool enable);
-       bool IsQuickPanelScrollEnabled(const _Window& window);
        result SetIndicatorShowState(const _Window& window, bool showState);
        bool GetIndicatorShowState(const _Window& window) const;
 
@@ -162,6 +160,8 @@ public:
        Ecore_Evas* GetEcoreEvas(void) const;
        Evas_Object* GetWindowObject(void) const;
        Ecore_X_Window GetXWindow(void) const;
+       void SetQuickPanelScrollEnabled(const _Window& window, bool enable);
+       bool IsQuickPanelScrollEnabled(const _Window& window);
 
 private:
        Tizen::Ui::Animations::_EflLayer* GetEflLayer(const _Window& window) const;