enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore imf - ibus - fix destroy/disconnect handling that crashes 

restart e or have ibus input get destroyed and come back... the ibus
module will do bad things to its pants... because the wrong things
were passed to the signal callbacks... this fixers that along with
ensuring a freed string ptr is NULL.

@fix
This commit is contained in:
Carsten Haitzler 2016-07-30 01:42:15 +09:00
parent 085623006d
commit 67246cddcb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/ecore_imf/ibus/ibus_imcontext.c
View File

@ -338,7 +338,7 @@ ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx)
if (ibus_bus_is_connected(_bus))
_ecore_imf_context_ibus_create(ibusimcontext);
g_signal_connect(_bus, "connected", G_CALLBACK (_ecore_imf_context_ibus_bus_connected_cb), ctx);
g_signal_connect(_bus, "connected", G_CALLBACK (_ecore_imf_context_ibus_bus_connected_cb), ibusimcontext);
}
EAPI void
@ -353,7 +353,7 @@ ecore_imf_context_ibus_del(Ecore_IMF_Context *ctx)
g_signal_handlers_disconnect_by_func(_bus,
G_CALLBACK(_ecore_imf_context_ibus_bus_connected_cb),
ctx);
ibusimcontext);
if (ibusimcontext->ibuscontext)
ibus_proxy_destroy((IBusProxy *)ibusimcontext->ibuscontext);
@ -361,6 +361,7 @@ ecore_imf_context_ibus_del(Ecore_IMF_Context *ctx)
// release preedit
if (ibusimcontext->preedit_string)
free(ibusimcontext->preedit_string);
ibusimcontext->preedit_string = NULL;
if (ibusimcontext->preedit_attrs)
{