Change uuid

Change-Id: I21db50f0f408a17160ad681d9e34ee7e4f791997

diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp
index 10e08b5..6100a57 100644 (file)
--- a/ism/extras/efl_setting/isf_setting_efl.cpp
+++ b/ism/extras/efl_setting/isf_setting_efl.cpp
@@ -723,7 +723,7 @@ static void helper_ise_reload (void)
     if (p != NULL)
         display_name = String (p);
     HelperAgent helper_agent;
-    HelperInfo  helper_info ("ff110940-b8f0-4062-9ff6-a84f4f3setup", "ISF Setting", "", "", SCIM_HELPER_STAND_ALONE);
+    HelperInfo  helper_info ("fd491a70-22f5-11e2-89f3-eb5999be869e", "ISF Setting", "", "", SCIM_HELPER_STAND_ALONE);
     int id = helper_agent.open_connection (helper_info, display_name);
     if (id == -1) {
         std::cerr << "    open_connection failed!!!!!!\n";

diff --git a/ism/src/scim_panel_agent.cpp b/ism/src/scim_panel_agent.cpp
index 035c22c..3b5fb09 100755 (executable)
--- a/ism/src/scim_panel_agent.cpp
+++ b/ism/src/scim_panel_agent.cpp
@@ -230,8 +230,6 @@ class PanelAgent::PanelAgentImpl
     IntIntRepository                    m_imcontrol_map;
     DEFAULT_ISE_T                       m_default_ise;
     bool                                m_should_shared_ise;
-    char *                              m_ise_settings;
-    size_t                              m_ise_settings_len;
     bool                                m_ise_exiting;
 
     int                                 m_last_socket_client;
@@ -338,7 +336,6 @@ public:
           m_current_ise_style (0),
           m_current_active_imcontrol_id (-1), m_pending_active_imcontrol_id (-1),
           m_should_shared_ise (false),
-          m_ise_settings (NULL), m_ise_settings_len (0),
           m_ise_exiting (false),
           m_last_socket_client (-1), m_last_client_context (0)
     {
@@ -1499,13 +1496,6 @@ public:
                 ret = show_helper (m_current_helper_uuid, data, len);
         }
 
-        if (data != NULL) {
-            if (m_ise_settings != NULL)
-                delete [] m_ise_settings;
-            m_ise_settings = data;
-            m_ise_settings_len = len;
-
-        }
         trans.clear ();
         trans.put_command (SCIM_TRANS_CMD_REPLY);
         trans.put_command (SCIM_TRANS_CMD_OK);