[4.0] Fix Set and Get InputPanelUserData()

Change-Id: Ia3d1ccdae71a6842faf41d1a8887e8ceff77525d

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index edd8899..e566ab9 100644 (file)
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -763,7 +763,7 @@ void ImfManager::SetInputPanelUserData( const std::string& data )
   if( mIMFContext )
   {
     int length = data.length();
-    ecore_imf_context_input_panel_imdata_set( mIMFContext, &data, length );
+    ecore_imf_context_input_panel_imdata_set( mIMFContext, data.c_str(), length );
   }
 }
 
@@ -773,8 +773,14 @@ void ImfManager::GetInputPanelUserData( std::string& data )
 
   if( mIMFContext )
   {
-    int* length = NULL;
-    ecore_imf_context_input_panel_imdata_get( mIMFContext, &data, length );
+    int length = 256;
+    char* buffer = reinterpret_cast< char* >( calloc ( 1, length * sizeof ( char ) ) );
+    if( buffer != NULL )
+    {
+      ecore_imf_context_input_panel_imdata_get( mIMFContext, buffer, &length );
+      data = buffer;
+      free( buffer );
+    }
   }
 }
 

diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index c9bef9c..cdae0be 100644 (file)
--- a/adaptors/x11/imf-manager-impl-x.cpp
+++ b/adaptors/x11/imf-manager-impl-x.cpp
@@ -597,7 +597,7 @@ void ImfManager::SetInputPanelUserData( const std::string& data )
   if( mIMFContext )
   {
     int length = data.length();
-    ecore_imf_context_input_panel_imdata_set( mIMFContext, &data, length );
+    ecore_imf_context_input_panel_imdata_set( mIMFContext, data.c_str(), length );
   }
 }
 
@@ -607,8 +607,14 @@ void ImfManager::GetInputPanelUserData( std::string& data )
 
   if( mIMFContext )
   {
-    int* length = NULL;
-    ecore_imf_context_input_panel_imdata_get( mIMFContext, &data, length );
+    int length = 256;
+    char* buffer = reinterpret_cast< char* >( calloc ( 1, length * sizeof ( char ) ) );
+    if( buffer != NULL )
+    {
+      ecore_imf_context_input_panel_imdata_get( mIMFContext, buffer, &length );
+      data = buffer;
+      free( buffer );
+    }
   }
 }