From c6985e1394f13ec2e7d467a1cd2eeebabaece151 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 6 Aug 2006 06:01:18 +0000 Subject: [PATCH] Free all XKB data. (#349997, Chris Wilson) 2006-08-06 Matthias Clasen * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free all XKB data. (#349997, Chris Wilson) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gdk/x11/gdkkeys-x11.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af5cc8a629..8870fced5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-06 Matthias Clasen + * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free + all XKB data. (#349997, Chris Wilson) + * gtk/gtkstyle.c (option_menu_get_props): Only get the indicator-size and indicator-spacing style properties for GtkOptionMenu. (#349859, Benjamin Otte) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index af5cc8a629..8870fced5a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-08-06 Matthias Clasen + * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free + all XKB data. (#349997, Chris Wilson) + * gtk/gtkstyle.c (option_menu_get_props): Only get the indicator-size and indicator-spacing style properties for GtkOptionMenu. (#349859, Benjamin Otte) diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 0fb4ae079f..d45ab1430d 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -187,7 +187,7 @@ gdk_keymap_x11_finalize (GObject *object) #ifdef HAVE_XKB if (keymap_x11->xkb_desc) - XkbFreeClientMap (keymap_x11->xkb_desc, 0, True); + XkbFreeKeyboard (keymap_x11->xkb_desc, XkbAllComponentsMask, True); #endif G_OBJECT_CLASS (parent_class)->finalize (object);