diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/input/gtkimcontextxim.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2007-01-26 Michael Natterer <mitch@imendio.com> + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): + destroy the XIM only if it exists. While the code does look safe + in general, there can be corner cases where the "reconnecting" + boolean being FALSE does not correspond to the XIM being + allocated (fix taken from maemo-gtk). + Fri Jan 26 13:07:07 2007 Tim Janik <timj@imendio.com> * gtk/gtkstyle.c (draw_insertion_cursor): clamp cursor coordinates to diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 68f6ec4f9d..f6f7bd947f 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -577,7 +577,7 @@ gtk_im_context_xim_finalize (GObject *obj) xim_instantiate_callback, (XPointer)context_xim->im_info); } - else + else if (context_xim->im_info->im) { XIMCallback im_destroy_callback; |