Unregister XIM callbacks here. (#309054)

2005-06-26  Matthias Clasen  <mclasen@redhat.com>

	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
	Unregister XIM callbacks here.  (#309054)
This commit is contained in:
Matthias Clasen
2005-06-27 02:29:29 +00:00
committed by Matthias Clasen
parent 504ee67c2e
commit d426fcb4d0
4 changed files with 33 additions and 0 deletions

View File

@@ -1,3 +1,8 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
2005-06-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't

View File

@@ -1,3 +1,8 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
2005-06-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't

View File

@@ -1,3 +1,8 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
2005-06-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't

View File

@@ -565,6 +565,24 @@ gtk_im_context_xim_finalize (GObject *obj)
context_xim->finalizing = TRUE;
if (context_xim->im_info)
{
GdkDisplay *display;
XIMCallback im_destroy_callback;
display = gdk_screen_get_display (context_xim->im_info->screen);
XUnregisterIMInstantiateCallback (GDK_DISPLAY_XDISPLAY (display),
NULL, NULL, NULL,
xim_instantiate_callback,
(XPointer)context_xim->im_info);
im_destroy_callback.client_data = NULL;
im_destroy_callback.callback = NULL;
XSetIMValues (context_xim->im_info->im,
XNDestroyCallback, &im_destroy_callback,
NULL);
}
set_ic_client_window (context_xim, NULL);
g_free (context_xim->locale);