Change scim_module.cpp compiling priority higher than scim_config_base.cpp

Change-Id: Id90d1fd44a9917d670f676b053cd480bea767432

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index e15e276..aefb024 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -3440,7 +3440,6 @@ finalize (void)
     _config.reset ();
     _config_connection.disconnect ();
     ConfigBase::set (0);
-    ConfigBase::unload ();
     _focused_ic = NULL;
     _ic_list = NULL;
 

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index 89ea57d..f82e729 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -104,13 +104,15 @@ endif
 
 lib_LTLIBRARIES        = libscim@SCIM_EPOCH@.la
 
-libscim@SCIM_EPOCH@_la_SOURCES = scim_backend.cpp \
-                         scim_chartraits.cpp \
+libscim@SCIM_EPOCH@_la_SOURCES = \
+                         scim_debug.cpp \
+                         scim_module.cpp \
+                         scim_backend.cpp \
+                         scim_chartraits.cpp \
                          scim_compose_key.cpp \
                          scim_config_base.cpp \
                          scim_config_module.cpp \
                          scim_connection.cpp \
-                         scim_debug.cpp \
                          scim_event.cpp \
                          scim_filter.cpp \
                          scim_filter_module.cpp \
@@ -126,7 +128,6 @@ libscim@SCIM_EPOCH@_la_SOURCES = scim_backend.cpp \
                          scim_imengine.cpp \
                          scim_imengine_module.cpp \
                          scim_lookup_table.cpp \
-                         scim_module.cpp \
                          scim_object.cpp \
                          scim_panel_agent.cpp \
                          scim_panel_client.cpp \

diff --git a/ism/src/scim_config_base.cpp b/ism/src/scim_config_base.cpp
index dc0a617..bfefda3 100644 (file)
--- a/ism/src/scim_config_base.cpp
+++ b/ism/src/scim_config_base.cpp
@@ -178,12 +178,6 @@ ConfigBase::get (bool create_on_demand, const String &default_module)
     return _scim_default_config;
 }
 
-void
-ConfigBase::unload ()
-{
-    _scim_default_config_module.unload ();
-}
-
 /*
  * Implementation of DummyConfig
  */

diff --git a/ism/src/scim_config_base.h b/ism/src/scim_config_base.h
index b31c2e6..ec4ab6d 100644 (file)
--- a/ism/src/scim_config_base.h
+++ b/ism/src/scim_config_base.h
@@ -365,13 +365,6 @@ public:
      */
     static ConfigPointer get (bool create_on_demand = true,
                               const String &default_module = String (""));
-    /**
-     * @brief Unload the default global Config module.
-     *
-     * If global Config object is used by calling function ConfigBase::get
-     * ConfigBase::unload is needed before exit.
-     */
-    static void unload ();
 };
 
 /**

diff --git a/ism/src/scim_config_module.cpp b/ism/src/scim_config_module.cpp
index 1b1a081..a834212 100644 (file)
--- a/ism/src/scim_config_module.cpp
+++ b/ism/src/scim_config_module.cpp
@@ -72,12 +72,6 @@ ConfigModule::load (const String &name)
 }
 
 bool
-ConfigModule::unload ()
-{
-    return m_module.unload ();
-}
-
-bool
 ConfigModule::valid () const
 {
     return (m_module.valid () && m_config_init && m_config_create_config);

diff --git a/ism/src/scim_config_module.h b/ism/src/scim_config_module.h
index ec962c6..353cb2e 100644 (file)
--- a/ism/src/scim_config_module.h
+++ b/ism/src/scim_config_module.h
@@ -104,12 +104,6 @@ public:
     bool load  (const String &name);
 
     /**
-     * @brief Unload the config Module.
-     * @return true if sucessfully unloaded.
-     */
-    bool unload ();
-
-    /**
      * @brief Check if a module is loaded and initialized successfully.
      * @return true if a module is already loaded and initialized successfully.
      */

diff --git a/ism/src/scim_helper_launcher.cpp b/ism/src/scim_helper_launcher.cpp
index 39d62ed..320bda7 100644 (file)
--- a/ism/src/scim_helper_launcher.cpp
+++ b/ism/src/scim_helper_launcher.cpp
@@ -201,7 +201,6 @@ int main (int argc, char *argv [])
     if (!config_pointer.null ())
         config_pointer.reset ();
     ConfigBase::set (0);
-    ConfigBase::unload ();
     snprintf (buf, sizeof (buf), "time:%ld  pid:%d  %s  %s  Helper ISE (%s) is destroyed!!!\n",
         time (0), getpid (), __FILE__, __func__, uuid.c_str ());
     isf_save_log (buf);