From 3943b45cf008a37d2d6af4ea982c7781d940a45d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 11 Aug 2014 11:05:41 +0900 Subject: [PATCH] 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. --- src/lib/ecore_imf/ecore_imf_context.c | 8 +++++--- 1 file 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) } 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; }