Check isf db first and then check default dir when loading modules

Change-Id: If79d395a09172169039a574c93a8815675623f7b

diff --git a/ism/src/scim_module.cpp b/ism/src/scim_module.cpp
index d6c793b..5297edd 100644 (file)
--- a/ism/src/scim_module.cpp
+++ b/ism/src/scim_module.cpp
@@ -202,6 +202,7 @@ Module::load (const String &name, const String &type)
     ModuleExitFunc new_exit;
 
     if (type.compare("Helper") == 0) {
+        isf_db_select_module_path_by_mode(TOOLBAR_HELPER_MODE, mpath);
         mpath.push_back(String(SCIM_MODULE_PATH) + String(SCIM_PATH_DELIM_STRING) + String(SCIM_BINARY_VERSION)
             + String(SCIM_PATH_DELIM_STRING) + String("Helper"));
         for (i = 0; i < mpath.size(); i++) {
@@ -212,6 +213,7 @@ Module::load (const String &name, const String &type)
         }
     }
     else if (type.compare("IMEngine") == 0 && name.compare("socket")) {
+        isf_db_select_module_path_by_mode(TOOLBAR_KEYBOARD_MODE, mpath);
         mpath.push_back(String(SCIM_MODULE_PATH) + String(SCIM_PATH_DELIM_STRING) + String(SCIM_BINARY_VERSION)
             + String(SCIM_PATH_DELIM_STRING) + String("IMEngine"));
         for (i = 0; i < mpath.size(); i++) {