forked from enlightenment/efl
Revert "ecore-imf: Don't always load all modules"
Reverting this as it broke autoloading of the ecore_imf WL module.
This commit basically only loaded an X11 Ecore_Imf module even under a
wayland environment.
This reverts commit 75b4bde8d2
.
This commit is contained in:
parent
75b4bde8d2
commit
5c858b86e5
|
@ -132,31 +132,14 @@ ecore_imf_module_init(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
Eina_Module *m;
|
||||
const char **itr;
|
||||
|
||||
for (itr = built_modules; *itr != NULL; itr++)
|
||||
{
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/ecore_imf/modules/%s/%s/module" SHARED_LIB_SUFFIX,
|
||||
eina_prefix_lib_get(pfx), *itr, MODULE_ARCH);
|
||||
|
||||
m = eina_module_new(buf);
|
||||
if (m)
|
||||
{
|
||||
module_list = eina_array_new(1);
|
||||
if (module_list)
|
||||
{
|
||||
eina_array_push(module_list, m);
|
||||
break;
|
||||
}
|
||||
else
|
||||
eina_module_free(m);
|
||||
}
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "%s/ecore_imf/modules", eina_prefix_lib_get(pfx));
|
||||
module_list = eina_module_arch_list_get(module_list, buf, MODULE_ARCH);
|
||||
}
|
||||
|
||||
if (module_list) eina_module_list_load(module_list);
|
||||
// XXX: MODFIX: do not list ALL modules and load them ALL! this is
|
||||
// is wrong - we end up loading BOTH xim ANd scim (and maybe uim too)
|
||||
// etc. etc. when we need only 1!
|
||||
eina_module_list_load(module_list);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue