Free all XKB data. (#349997, Chris Wilson)

2006-08-06  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free
	all XKB data. (#349997, Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index af5cc8a62985ba3805967fce332a4a48cbbd2175..8870fced5a785b4c4e9da91ea2e8c643b812d69a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 af5cc8a62985ba3805967fce332a4a48cbbd2175..8870fced5a785b4c4e9da91ea2e8c643b812d69a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-08-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 0fb4ae079feda7ac1ba1f3a51b4c138f7fad05bf..d45ab1430df4778d7905427e096b7fab00f5fdd9 100644 (file)
--- 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);