Make sure the changed initial ISE is properly stored

Change-Id: I4c03a7efc18380717875c86c98349e322fd823f9

diff --git a/ism/src/scim_global_config.cpp b/ism/src/scim_global_config.cpp
index 4e75466ca5b0e097a5e16e568946decba5ed72ef..b948d70b8899f111627fa064e1562e4ab772bbde 100644 (file)
--- a/ism/src/scim_global_config.cpp
+++ b/ism/src/scim_global_config.cpp
@@ -447,6 +447,9 @@ scim_global_config_flush ()
             usr_os << it->first << " = " << it->second << "\n";
         }
         __config_repository.updated.clear ();
+
+        sync();
+
         return true;
     }
 

diff --git a/ism/src/scim_panel_agent.cpp b/ism/src/scim_panel_agent.cpp
index 32c23d04857411fce31f166f2a44d474c2eef872..5fa7b1c6f667b28d8a2ed1ced2c713fc75531819 100644 (file)
--- a/ism/src/scim_panel_agent.cpp
+++ b/ism/src/scim_panel_agent.cpp
@@ -1748,9 +1748,13 @@ public:
     void show_ise_panel (int client_id)
     {
         SCIM_DEBUG_MAIN(4) << "PanelAgent::show_ise_panel ()\n";
+
+        String initial_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String (""));
+        String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), String (""));
+
         char buf[256] = {0};
-        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to show ISE %d\n",
-            time (0), getpid (), __FILE__, __func__, client_id);
+        snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  prepare to show ISE %d [%s] [%s]\n",
+            time (0), getpid (), __FILE__, __func__, client_id, initial_uuid.c_str(), default_uuid.c_str());
         isf_save_log (buf);
 
         char   *data = NULL;
@@ -2533,6 +2537,7 @@ public:
         String uuid (buf);
 
         scim_global_config_write (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String (uuid));
+        scim_global_config_flush ();
 
         if (NULL != buf)
             delete[] buf;