From: Heeyong Song Date: Mon, 11 Sep 2017 06:48:29 +0000 (+0900) Subject: Revert "[Tizen] Fix Set and Get InputPanelUserData()" X-Git-Tag: accepted/tizen/4.0/unified/20170918.093603~14 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=a7a4e677915974dec21da2af195886c7b798e11b Revert "[Tizen] Fix Set and Get InputPanelUserData()" This reverts commit f6ea4d003f889fe345097af5b9a125a722ae4528. Change-Id: Ic70bb1be31ea9387f36ae5c9c5f62ba37b728b0f --- diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp index 0f23a74..5764c3a 100644 --- 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 f8c9811..e0fa762 100644 --- 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 ); } }