Revert "[N_SE-40957] Set 'transient_for' from the keyboard settings to the target...
authorwoojin nam <w.nam@samsung.com>
Fri, 28 Jun 2013 12:40:03 +0000 (12:40 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Fri, 28 Jun 2013 12:40:03 +0000 (12:40 +0000)
This reverts commit 8d91bd8cf6477c6a6028fe72b3c25b45bce6ddc7

Change-Id: I5db36fbf07c4b3350f16fdf9fb95384820e9a82c

src/app/FApp_UiAppImpl.cpp
src/app/inc/FApp_UiAppImpl.h

index 0ab942b..9097615 100755 (executable)
  * @brief      This is the implementation for the _UiAppImpl class.
  */
 
-#include <appsvc/appsvc.h>
 #include <bundle.h>
-#include <glib.h>
+#include <appsvc/appsvc.h>
 #include <unique_ptr.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
 
 #include <FBaseSysLog.h>
 #include <FBaseColArrayList.h>
@@ -122,57 +119,6 @@ _UiAppImpl::RaiseFrame(Frame& frame)
 }
 
 
-long
-_UiAppImpl::GetTargetWindowHandle(void) const
-{
-       result r = E_SUCCESS;
-
-       _EcoreEvasMgr* pEcoreEvasMgr = GetEcoreEvasMgr();
-       r = GetLastResult();
-       SysTryReturn(NID_APP, pEcoreEvasMgr, -1, r, "Propagating.");
-
-       _EcoreEvas* pEcoreEvas = pEcoreEvasMgr->GetEcoreEvas();
-       r = GetLastResult();
-       SysTryReturn(NID_APP, pEcoreEvas, -1, r, "Propagating.");
-
-       Atom actualTypeReturn;
-       int actualFormatReturn;
-       unsigned long nItemsReturn;
-       unsigned long bytesAfterReturn;
-       unsigned char* pPropReturn = null;
-
-    gint ret = 0;
-    ret = XGetWindowProperty(static_cast<Display*>(ecore_x_display_get()),
-                                                       ecore_x_window_root_get(pEcoreEvas->GetXWindow()),
-                                                       ecore_x_atom_get("_ISF_ACTIVE_WINDOW"),
-                                                       0,
-                                                       G_MAXLONG,
-                                                       false,
-                                                       XA_WINDOW,
-                                                       &actualTypeReturn,
-                                                       &actualFormatReturn,
-                                                       &nItemsReturn,
-                                                       &bytesAfterReturn,
-                                                       &pPropReturn);
-       SysTryReturn(NID_APP, ret == Success, -1, E_SYSTEM, "A failure occurs from the underlying system.");
-
-       Ecore_X_Window targetWindow = 0;
-
-       if (pPropReturn)
-       {
-               if (actualTypeReturn == XA_WINDOW)
-               {
-                       targetWindow = *(reinterpret_cast<Ecore_X_Window*>(pPropReturn));
-                       SysLog(NID_APP, "The handle of the target window is %x.", targetWindow);
-               }
-
-               XFree(pPropReturn);
-       }
-
-       return targetWindow? targetWindow: -1;
-}
-
-
 static int
 TransientResponseCb(void* pData)
 {
@@ -339,20 +285,8 @@ _UiAppImpl::OnFrameRaiseRequested(void)
 long
 _UiAppImpl::OnWindowHandleRequest(void)
 {
-       long handle = -1;
-       int type = _AppInfo::GetAppType();
-
-       if (type & _APP_TYPE_IME_APP)
-       {
-               handle = GetTargetWindowHandle();
-       }
-       else
-       {
-               const _EcoreEvas* const pEvas = GetEcoreEvasMgr()->GetEcoreEvas();
-               handle = (pEvas) ? static_cast<long>(pEvas->GetXWindow()) : -1;
-       }
-
-       return handle;
+       const _EcoreEvas* const pEvas = GetEcoreEvasMgr()->GetEcoreEvas();
+       return (pEvas) ? static_cast<long>(pEvas->GetXWindow()) : -1;
 }
 
 
index 0546e1d..5c6c7c9 100755 (executable)
@@ -311,8 +311,6 @@ private:
         */
        void RaiseFrame(Tizen::Ui::Controls::Frame& frame);
 
-       long GetTargetWindowHandle(void) const;
-
 private:
        static _UiAppImpl* __pUiAppImpl;