Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unregister XIM callbacks here. (#309054)

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

	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
	Unregister XIM callbacks here.  (#309054)

	* modules/input/gtkimcontextxim.h: Small cleanup.
This commit is contained in:
Matthias Clasen
2005-06-27 02:27:41 +00:00
committed by Matthias Clasen
parent 92e3227043
commit 1b8d849b36
5 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
* modules/input/gtkimcontextxim.h: Small cleanup.
* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
scroll offset when drawing the box. (#308834, Tom von
Schwerdtner)

5
ChangeLog.pre-2-10
View File

@@ -1,5 +1,10 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
* modules/input/gtkimcontextxim.h: Small cleanup.
* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
scroll offset when drawing the box. (#308834, Tom von
Schwerdtner)

5
ChangeLog.pre-2-8
View File

@@ -1,5 +1,10 @@
2005-06-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
Unregister XIM callbacks here. (#309054)
* modules/input/gtkimcontextxim.h: Small cleanup.
* gtk/gtkmenu.c (gtk_menu_paint): Pay attention to the
scroll offset when drawing the box. (#308834, Tom von
Schwerdtner)

18
modules/input/gtkimcontextxim.c
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);

9
modules/input/gtkimcontextxim.h
View File

@@ -23,10 +23,7 @@
#include <gtk/gtkimcontext.h>
#include "x11/gdkx.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
extern GType gtk_type_im_context_xim;
@@ -51,9 +48,7 @@ GtkIMContext *gtk_im_context_xim_new (void);
void gtk_im_context_xim_shutdown (void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* __GTK_IM_CONTEXT_XIM_H__ */