jihoon pushed a commit to branch efl-1.11. http://git.enlightenment.org/core/efl.git/commit/?id=19d5a71450a9d9331352a09fc7b3199a56d0d7e9
commit 19d5a71450a9d9331352a09fc7b3199a56d0d7e9 Author: Jihoon Kim <[email protected]> Date: Sat Oct 4 13:13:46 2014 +0900 ecore_imf/ibus : fix bug not to show preedit string on Ubuntu 14.04 since ibus 1.5, enabled, disabled signal was deleted. It affected bug not to show preedit string, so code has been updated according to the change of the latest ibus 1.5. It works well with the older ibus version --- src/modules/ecore_imf/ibus/ibus_imcontext.c | 50 +---------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c index abd83f5..57d9e97 100644 --- a/src/modules/ecore_imf/ibus/ibus_imcontext.c +++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c @@ -22,8 +22,6 @@ struct _IBusIMContext /* instance members */ Ecore_IMF_Context *ctx; - /* enabled */ - Eina_Bool enable; IBusInputContext *ibuscontext; /* preedit status */ @@ -272,9 +270,6 @@ ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx) ibusimcontext->client_window = 0; - // Init ibus status - ibusimcontext->enable = EINA_FALSE; - // Init preedit status ibusimcontext->preedit_string = NULL; ibusimcontext->preedit_attrs = NULL; @@ -489,7 +484,7 @@ ecore_imf_context_ibus_preedit_string_get(Ecore_IMF_Context *ctx, IBusIMContext *ibusimcontext = (IBusIMContext*)ecore_imf_context_data_get(ctx); EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); - if (ibusimcontext->enable && ibusimcontext->preedit_visible) + if (ibusimcontext->preedit_visible) { if (str) *str = strdup(ibusimcontext->preedit_string ? ibusimcontext->preedit_string: ""); @@ -912,40 +907,6 @@ _ecore_imf_context_ibus_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_ } static void -_ecore_imf_context_ibus_enabled_cb(IBusInputContext *ibuscontext EINA_UNUSED, - IBusIMContext *ibusimcontext) -{ - EINA_LOG_DBG("%s", __FUNCTION__); - EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); - - ibusimcontext->enable = EINA_TRUE; -} - -static void -_ecore_imf_context_ibus_disabled_cb(IBusInputContext *ibuscontext EINA_UNUSED, - IBusIMContext *ibusimcontext) -{ - EINA_LOG_DBG("%s", __FUNCTION__); - EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); - - ibusimcontext->enable = EINA_FALSE; - - /* clear preedit */ - ibusimcontext->preedit_visible = EINA_FALSE; - ibusimcontext->preedit_cursor_pos = 0; - free (ibusimcontext->preedit_string); - ibusimcontext->preedit_string = NULL; - - // call preedit changed - ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx); - ecore_imf_context_event_callback_call(ibusimcontext->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); - - // call preedit end - ecore_imf_context_preedit_end_event_add(ibusimcontext->ctx); - ecore_imf_context_event_callback_call(ibusimcontext->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); -} - -static void _ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED, IBusIMContext *ibusimcontext) { @@ -953,7 +914,6 @@ _ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED, EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); ibusimcontext->ibuscontext = NULL; - ibusimcontext->enable = EINA_FALSE; /* clear preedit */ ibusimcontext->preedit_visible = EINA_FALSE; @@ -1000,14 +960,6 @@ _ecore_imf_context_ibus_create(IBusIMContext *ibusimcontext) "hide-preedit-text", G_CALLBACK (_ecore_imf_context_ibus_hide_preedit_text_cb), ibusimcontext); - g_signal_connect(ibusimcontext->ibuscontext, - "enabled", - G_CALLBACK (_ecore_imf_context_ibus_enabled_cb), - ibusimcontext); - g_signal_connect(ibusimcontext->ibuscontext, - "disabled", - G_CALLBACK (_ecore_imf_context_ibus_disabled_cb), - ibusimcontext); g_signal_connect(ibusimcontext->ibuscontext, "destroy", G_CALLBACK (_ecore_imf_context_ibus_destroy_cb), ibusimcontext); --
