Fix wrong parameter of get_ise_language_locale

Change-Id: I2cd299dd609c637c5ab7a06bc12d08c054a752ab

diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
index 0c72da0..d1f21c1 100644 (file)
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -874,7 +874,7 @@ private:
             LOGW ("failed\n");
     }
 
-    void get_ise_language_locale(int client, uint32 context, String& uuid, char* data,  size_t& len) {
+    void get_ise_language_locale(int client, uint32 context, String& uuid, char** data,  size_t& len) {
         SCIM_DEBUG_MAIN(4) << __func__ << "\n";
         LOGD ("client id:%d\n", client);
 
@@ -892,7 +892,7 @@ private:
         if (trans.write_to_socket(client_socket)
             && trans.read_from_socket(client_socket)
             && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY
-            && trans.get_data(&data, len)) {
+            && trans.get_data(data, len)) {
         } else {
             LOGW ("failed\n");
         }
@@ -1672,7 +1672,7 @@ private:
                     } else if (cmd == ISM_TRANS_CMD_GET_ISE_LANGUAGE_LOCALE) {
                         size_t  len;
                         char*   data = NULL;
-                        m_info_manager->get_ise_language_locale(client_id, data, len);
+                        m_info_manager->get_ise_language_locale(client_id, &data, len);
                         Transaction trans;
                         trans.clear();
                         trans.put_command(SCIM_TRANS_CMD_REPLY);

diff --git a/ism/modules/panelagent/wayland/isf_wsc_control.cpp b/ism/modules/panelagent/wayland/isf_wsc_control.cpp
index 9580ef5..737aef0 100644 (file)
--- a/ism/modules/panelagent/wayland/isf_wsc_control.cpp
+++ b/ism/modules/panelagent/wayland/isf_wsc_control.cpp
@@ -81,7 +81,7 @@ int _isf_wsc_context_input_panel_language_locale_get (int context, char** locale
 {
     size_t datalen = 0;
     char*  data = NULL;
-    g_info_manager->get_ise_language_locale (get_panel_client_id (), data, datalen);
+    g_info_manager->get_ise_language_locale (get_panel_client_id (), &data, datalen);
 
     if (locale)
         *locale = strndup (data, datalen);

diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp
index 909929f..8505aeb 100644 (file)
--- a/ism/src/isf_info_manager.cpp
+++ b/ism/src/isf_info_manager.cpp
@@ -1417,7 +1417,7 @@ public:
         m_signal_get_candidate_geometry (info);
     }
     //ISM_TRANS_CMD_GET_ISE_LANGUAGE_LOCALE
-    void get_ise_language_locale (int client_id, _OUT_ char* data, _OUT_ size_t& len) {
+    void get_ise_language_locale (int client_id, _OUT_ char** data, _OUT_ size_t& len) {
         SCIM_DEBUG_MAIN (4) << __func__ << "\n";
         LOGD ("");
         Transaction trans;
@@ -4038,7 +4038,7 @@ void InfoManager::get_candidate_window_geometry (int client_id, _OUT_ struct rec
 
 
 //ISM_TRANS_CMD_GET_ISE_LANGUAGE_LOCALE
-void InfoManager::get_ise_language_locale (int client_id, _OUT_ char* data, _OUT_ size_t& len)
+void InfoManager::get_ise_language_locale (int client_id, _OUT_ char** data, _OUT_ size_t& len)
 {
     m_impl->get_ise_language_locale (client_id, data, len);
 }

diff --git a/ism/src/isf_info_manager.h b/ism/src/isf_info_manager.h
index 8019074..30deb02 100644 (file)
--- a/ism/src/isf_info_manager.h
+++ b/ism/src/isf_info_manager.h
@@ -592,7 +592,7 @@ public:
 
 
     //ISM_TRANS_CMD_GET_ISE_LANGUAGE_LOCALE
-    void get_ise_language_locale (int client_id, _OUT_ char* data, _OUT_ size_t& len);
+    void get_ise_language_locale (int client_id, _OUT_ char** data, _OUT_ size_t& len);
 
     //ISM_TRANS_CMD_SET_LAYOUT
     void set_ise_layout (int client_id, uint32 layout);

diff --git a/ism/src/isf_panel_agent_base.cpp b/ism/src/isf_panel_agent_base.cpp
index ed1b9b1..1e6fa86 100644 (file)
--- a/ism/src/isf_panel_agent_base.cpp
+++ b/ism/src/isf_panel_agent_base.cpp
@@ -322,7 +322,7 @@ void PanelAgentBase::get_helper_layout (int client, uint32 context, String& uuid
 }
 
 
-void PanelAgentBase::get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char* data, _OUT_ size_t& len)
+void PanelAgentBase::get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char** data, _OUT_ size_t& len)
 {
     LOGW ("not implemented for %s", m_name.c_str ());
 }

diff --git a/ism/src/isf_panel_agent_base.h b/ism/src/isf_panel_agent_base.h
index 4ff3a48..a6855a0 100644 (file)
--- a/ism/src/isf_panel_agent_base.h
+++ b/ism/src/isf_panel_agent_base.h
@@ -509,7 +509,7 @@ public:
      *
      * @return none.
      */
-    virtual void get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char* data, _OUT_ size_t& len);
+    virtual void get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char** data, _OUT_ size_t& len);
 
     /**
      * @brief check_option_window.

diff --git a/ism/src/isf_panel_agent_manager.cpp b/ism/src/isf_panel_agent_manager.cpp
index f33b009..22d25c7 100644 (file)
--- a/ism/src/isf_panel_agent_manager.cpp
+++ b/ism/src/isf_panel_agent_manager.cpp
@@ -523,7 +523,7 @@ void PanelAgentManager::get_helper_layout (int id, uint32 context_id, String& uu
         _p->get_helper_layout (id, context_id, uuid, layout);
 }
 
-void PanelAgentManager::get_ise_language_locale (int id, uint32 context_id, String& uuid, _OUT_ char* data, _OUT_ size_t& len)
+void PanelAgentManager::get_ise_language_locale (int id, uint32 context_id, String& uuid, _OUT_ char** data, _OUT_ size_t& len)
 {
     PanelAgentPointer _p = m_impl->get_panel_agent_by_id (id);
 

diff --git a/ism/src/isf_panel_agent_manager.h b/ism/src/isf_panel_agent_manager.h
index 5e3e981..b3ee1ea 100644 (file)
--- a/ism/src/isf_panel_agent_manager.h
+++ b/ism/src/isf_panel_agent_manager.h
@@ -310,7 +310,7 @@ public:
     bool get_helper_geometry (int client, uint32 context, String& uuid, _OUT_ struct rectinfo& info);
     void get_helper_imdata (int client, uint32 context, String& uuid, _OUT_ char** imdata, _OUT_ size_t& len);
     void get_helper_layout (int client, uint32 context, String& uuid, uint32& layout);
-    void get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char* data, _OUT_ size_t& len);
+    void get_ise_language_locale (int client, uint32 context, String& uuid, _OUT_ char** data, _OUT_ size_t& len);
     void check_option_window (int client, uint32 context, String& uuid, _OUT_ uint32& avail);
     void reset_ise_option (int client_id, uint32 context);
     void reset_helper_context (int client_id, uint32 context, const String& uuid);