[4.0] Ubuntu Build Error fix

This reverts commit 5b213e495ebc431405e13ed47e15e2bef45a9e20.

Change-Id: I5cb9e3d7b05f0b6247478fc57ffc115b94395cf7

diff --git a/adaptors/integration-api/x11/imf-manager-impl.h b/adaptors/integration-api/x11/imf-manager-impl.h
index f069d42..f8d456b 100755 (executable)
--- a/adaptors/integration-api/x11/imf-manager-impl.h
+++ b/adaptors/integration-api/x11/imf-manager-impl.h
@@ -72,7 +72,7 @@ public:
    * Constructor
    * @param[in] ecoreXwin, The window is created by application.
    */
-  ImfManager( Ecore_X_Window* ecoreXwin );
+  ImfManager( Ecore_X_Window ecoreXwin );
 
   /**
    * Connect Callbacks required for IMF.
@@ -270,7 +270,7 @@ private:
    * Context created the first time and kept until deleted.
    * @param[in] ecoreXwin, The window is created by application.
    */
-  void CreateContext( Ecore_X_Window* ecoreXwin );
+  void CreateContext( Ecore_X_Window ecoreXwin );
 
   /**
    * @copydoc Dali::ImfManager::DeleteContext()
@@ -284,7 +284,7 @@ private:
 
 private:
   Ecore_IMF_Context* mIMFContext;
-  Ecore_X_Window* mEcoreXWin;
+  Ecore_X_Window mEcoreXWin;
   int mIMFCursorPosition;
   std::string mSurroundingText;
 

diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index 5eb6b91..ac52681 100755 (executable)
--- a/adaptors/x11/imf-manager-impl-x.cpp
+++ b/adaptors/x11/imf-manager-impl-x.cpp
@@ -173,7 +173,7 @@ Dali::ImfManager ImfManager::Get()
 
       // The Ecore_X_Window needs to use the ImfManager.
       // Only when the render surface is window, we can get the Ecore_X_Window.
-      Ecore_X_Window *ecoreXwin( AnyCast< Ecore_X_Window* >( nativeWindow ) );
+      Ecore_X_Window ecoreXwin( AnyCast< Ecore_X_Window >( nativeWindow ) );
       if ( ecoreXwin )
       {
         // If we fail to get Ecore_X_Window, we can't use the ImfManager correctly.
@@ -190,20 +190,20 @@ Dali::ImfManager ImfManager::Get()
     }
   }
 
-  if ( ( imfManager != NULL ) !imfManager->mInited )
+  if ( ( imfManager != NULL ) &&!imfManager->mInited )
   {
     ecore_imf_init();
     imfManager->CreateContext( imfManager->mEcoreXWin );
 
     imfManager->ConnectCallbacks();
-    VirtualKeyboard::ConnectCallbacks( mIMFContext );
+    VirtualKeyboard::ConnectCallbacks( imfManager->mIMFContext );
     imfManager->mInited = true;
   }
 
   return manager;
 }
 
-ImfManager::ImfManager( Ecore_X_Window* ecoreXwin )
+ImfManager::ImfManager(Ecore_X_Window ecoreXwin )
 : mIMFContext(),
   mEcoreXWin( ecoreXwin ),
   mIMFCursorPosition( 0 ),
@@ -219,7 +219,7 @@ ImfManager::~ImfManager()
   Finalize();
 }
 
-void ImfManager::CreateContext( Ecore_X_Window* ecoreXwin )
+void ImfManager::CreateContext( Ecore_X_Window ecoreXwin )
 {
   DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::CreateContext\n" );