From 05c1103a518b82cd6bf8ec9a7ace8165574d7b8a Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Tue, 11 Aug 2015 20:13:05 +0800 Subject: [PATCH] Do not load IME in application when socket invalidate Change-Id: I351534876b72b15b57cbde281fe6fd4a87b288da Signed-off-by: Li Zhang --- configure.ac | 10 ++++++++++ ism/extras/efl_immodule/isf_imf_context.cpp | 3 ++- packaging/isf.spec | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0d09d6d..08043f7 100644 --- a/configure.ac +++ b/configure.ac @@ -496,6 +496,11 @@ AC_ARG_ENABLE(lazy-launch, enable_lazy_launch=yes, enable_lazy_launch=no) +AC_ARG_ENABLE(ime-embed-app, + [ --disable-ime-embed-app Do not load IME in application when socket invalidate], + enable_ime_embed_app=no, + enable_ime_embed_app=yes) + if test "$have_x" = "yes"; then SCIM_BUILD_X11_UTILS=1 enable_x11_utils=yes @@ -644,6 +649,10 @@ else ISF_INSTALL_SYSTEMD_SCRIPT=1 fi +if test "$enable_ime_embed_app" = "yes"; then + AC_DEFINE(ENABLE_IME_EMBED_APP,1,[Load imengine in application side when socket invalidate]) +fi + AM_CONDITIONAL(SCIM_LD_VERSION_SCRIPT, [test "$enable_ld_version_script" = "yes"]) @@ -816,5 +825,6 @@ Module options: Enable TrayIcon $enable_tray_icon Enable MultiWindow $enable_multiwindow_support Enable LazyLaunch $enable_lazy_launch + Enable IME Embed $enable_ime_embed_app ]) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 94ecd07..d7e9237 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -3375,6 +3375,7 @@ initialize (void) } if (!check_result) { +#if ENABLE_IME_EMBED_APP //get modules list scim_get_imengine_module_list (engine_list); scim_get_helper_module_list (helper_list); @@ -3385,7 +3386,7 @@ initialize (void) } for (it = helper_list.begin (); it != helper_list.end (); it++) load_engine_list.push_back (*it); - +#endif launch_socket_frontend (); manual = false; } diff --git a/packaging/isf.spec b/packaging/isf.spec index 266f8cc..544e20f 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -111,7 +111,8 @@ CXXFLAGS+=" -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} --disable-wsc-efl \ %endif --disable-frontend-x11 \ - --disable-multiwindow-support + --disable-multiwindow-support \ + --disable-ime-embed-app make %{?_smp_mflags} %install -- 2.7.4