Revert "[4.0] Fix Set and Get InputPanelUserData()"

This reverts commit 9ef8f766f6ab4ff62b6d225c592aa84e40c7a38c.

Change-Id: Icbdde83c35d172e906cc09831920e34066e258ad

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index e566ab9..edd8899 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.c_str(), length );
+    ecore_imf_context_input_panel_imdata_set( mIMFContext, &data, length );
   }
 }
 
@@ -773,14 +773,8 @@ void ImfManager::GetInputPanelUserData( std::string& data )
 
   if( mIMFContext )
   {
-    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 );
-    }
+    int* length = NULL;
+    ecore_imf_context_input_panel_imdata_get( mIMFContext, &data, length );
   }
 }
 

diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index cdae0be..c9bef9c 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.c_str(), length );
+    ecore_imf_context_input_panel_imdata_set( mIMFContext, &data, length );
   }
 }
 
@@ -607,14 +607,8 @@ void ImfManager::GetInputPanelUserData( std::string& data )
 
   if( mIMFContext )
   {
-    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 );
-    }
+    int* length = NULL;
+    ecore_imf_context_input_panel_imdata_get( mIMFContext, &data, length );
   }
 }