Modified to use simple config when _scim_config is NULL

Change-Id: Ic695ac3112be00dcc8c8a487c26686e8732dd692

diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp
index 136fe6f..7773d10 100644 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -663,11 +663,23 @@ sclboolean CSCLConnectionISF::init()
         m_initialized = TRUE;
     }
 
+    if (_scim_config.null()) {
+        scim::ConfigPointer config_pointer = scim::ConfigBase::get(true, "simple");
+        if (config_pointer.null()) {
+            config_pointer = new scim::DummyConfig();
+        }
+        _scim_config = config_pointer;
+    }
+
     return TRUE;
 }
 
 void CSCLConnectionISF::fini()
 {
+    if (!_scim_config.null()) {
+        _scim_config.reset();
+    }
+    scim::ConfigBase::set(0);
     close_connection();
     m_initialized = FALSE;
 }