summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ecore_imf/ecore_imf_module.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_imf.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index 9deede1..1d5747e 100644
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -69,7 +69,7 @@ ecore_imf_module_init(void)
69 69
70 modules_load = built_modules; 70 modules_load = built_modules;
71 env = getenv("ECORE_IMF_MODULE"); 71 env = getenv("ECORE_IMF_MODULE");
72 if (env) 72 if ((env) && (env[0]))
73 { 73 {
74 modules_one[0] = env; 74 modules_one[0] = env;
75 modules_load = modules_one; 75 modules_load = modules_one;
@@ -99,7 +99,7 @@ ecore_imf_module_init(void)
99 if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY"))) 99 if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
100 env = "xim"; 100 env = "xim";
101#endif 101#endif
102 if (env) 102 if ((env) && (env[0]))
103 { 103 {
104 const char **itr; 104 const char **itr;
105 Eina_Bool ok = EINA_FALSE; 105 Eina_Bool ok = EINA_FALSE;
diff --git a/src/tests/ecore/ecore_test_ecore_imf.c b/src/tests/ecore/ecore_test_ecore_imf.c
index 486aa46..95c3b65 100644
--- a/src/tests/ecore/ecore_test_ecore_imf.c
+++ b/src/tests/ecore/ecore_test_ecore_imf.c
@@ -47,6 +47,7 @@ START_TEST(ecore_test_ecore_imf_modules)
47 Eina_List *modules; 47 Eina_List *modules;
48 const char **itr; 48 const char **itr;
49 49
50 putenv("ECORE_IMF_MODULE=");
50 ecore_imf_init(); 51 ecore_imf_init();
51 modules = ecore_imf_context_available_ids_get(); 52 modules = ecore_imf_context_available_ids_get();
52 53
@@ -64,10 +65,10 @@ END_TEST
64 65
65START_TEST(ecore_test_ecore_imf_modules_load) 66START_TEST(ecore_test_ecore_imf_modules_load)
66{ 67{
67 const char **itr; 68 const char **itr, *env;
68 69
70 putenv("ECORE_IMF_MODULE=");
69 ecore_imf_init(); 71 ecore_imf_init();
70
71 for (itr = built_modules; *itr != NULL; itr++) 72 for (itr = built_modules; *itr != NULL; itr++)
72 { 73 {
73 Ecore_IMF_Context *ctx = ecore_imf_context_add(*itr); 74 Ecore_IMF_Context *ctx = ecore_imf_context_add(*itr);