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
This commit is contained in:
Michael Natterer 2007-01-26 13:31:35 +00:00 committed by Michael Natterer
parent 8c2c327d34
commit ff560c934e
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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;