diff options
author | Michael Natterer <mitch@imendio.com> | 2007-01-26 13:31:35 +0000 |
---|---|---|
committer | Michael Natterer <mitch@src.gnome.org> | 2007-01-26 13:31:35 +0000 |
commit | ff560c934e837540307669c240d1e390adc99f2c (patch) | |
tree | da4e61aac6eb530ff5d65dffbbf93138a76b6d14 /modules/input/gtkimcontextxim.c | |
parent | 8c2c327d34daa0d93f9865cbadb8642a7844dd95 (diff) | |
download | gtk+-ff560c934e837540307669c240d1e390adc99f2c.tar.gz |
destroy the XIM only if it exists. While the code does look safe in
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).
svn path=/trunk/; revision=17218
Diffstat (limited to 'modules/input/gtkimcontextxim.c')
-rw-r--r-- | modules/input/gtkimcontextxim.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |