kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

imf - fix x11 vs wl fix to leave x11 alone for those without scim 

scim has a nasty habit of sitting and hanging if tryng to set up and
no scim daemon is there. since in x11 you may have multiple input
methods, leave it to be manually set up via env var, and if not then
dont work at all.
This commit is contained in:
Carsten Haitzler 2014-08-11 11:05:41 +09:00
parent 81d6713324
commit 3943b45cf0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/ecore_imf/ecore_imf_context.c
View File

@ -73,9 +73,11 @@ ecore_imf_context_default_id_by_canvas_type_get(const char *canvas_type)
}
else
{
if (getenv("DISPLAY")) id = "scim";
else if (getenv("WAYLAND_DISPLAY")) id = "wayland";
if (ecore_imf_module_get(id)) return id;
if (getenv("WAYLAND_DISPLAY"))
{
id = "wayland";
if (ecore_imf_module_get(id)) return id;
}
return NULL;
}