diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-11 11:05:41 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-11 11:05:41 +0900 |
commit | 3943b45cf008a37d2d6af4ea982c7781d940a45d (patch) | |
tree | b1f59593c7402259678772a314f34dd9dadacac8 /src/lib/ecore_imf/ecore_imf_context.c | |
parent | 81d6713324cb7a784ae163610e45758b3fc40e54 (diff) |
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.
Diffstat (limited to 'src/lib/ecore_imf/ecore_imf_context.c')
-rw-r--r-- | src/lib/ecore_imf/ecore_imf_context.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c index 8a0cf1face..6955980e7a 100644 --- a/src/lib/ecore_imf/ecore_imf_context.c +++ b/src/lib/ecore_imf/ecore_imf_context.c | |||
@@ -73,9 +73,11 @@ ecore_imf_context_default_id_by_canvas_type_get(const char *canvas_type) | |||
73 | } | 73 | } |
74 | else | 74 | else |
75 | { | 75 | { |
76 | if (getenv("DISPLAY")) id = "scim"; | 76 | if (getenv("WAYLAND_DISPLAY")) |
77 | else if (getenv("WAYLAND_DISPLAY")) id = "wayland"; | 77 | { |
78 | if (ecore_imf_module_get(id)) return id; | 78 | id = "wayland"; |
79 | if (ecore_imf_module_get(id)) return id; | ||
80 | } | ||
79 | return NULL; | 81 | return NULL; |
80 | } | 82 | } |
81 | 83 | ||