get the types as well as the symbols because we need them in

Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>

	* gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
	symbols because we need them in MyEnhancedXkbTranslateKeyCode.

diff --git a/ChangeLog b/ChangeLog
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5a5f0ef172af8be288d59a03086d3b5df0deb20f..4b10e60f8d91636e2600d097b75e3514f3630715 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jan  9 20:56:42 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (get_xkb): get the types as well as the
+       symbols because we need them in MyEnhancedXkbTranslateKeyCode.
+
 2002-01-10  Tor Lillqvist  <tml@iki.fi>
 
        Apply the same fixes and improvements as to the

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index db587736cf3f054afbee404fb53cef3eded14b72..4e0a928837f38f5451f28569953565c357ff4ec6 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -68,7 +68,7 @@ get_xkb (void)
   
   if (xkb_desc == NULL)
     {
-      xkb_desc = XkbGetMap (gdk_display, XkbKeySymsMask, XkbUseCoreKbd);
+      xkb_desc = XkbGetMap (gdk_display, XkbKeySymsMask | XkbKeyTypesMask, XkbUseCoreKbd);
       if (xkb_desc == NULL)
         g_error ("Failed to get keymap");
 
@@ -76,7 +76,7 @@ get_xkb (void)
     }
   else if (current_serial != _gdk_keymap_serial)
     {
-      XkbGetUpdatedMap (gdk_display, XkbKeySymsMask, xkb_desc);
+      XkbGetUpdatedMap (gdk_display, XkbKeySymsMask | XkbKeyTypesMask, xkb_desc);
       XkbGetNames (gdk_display, XkbGroupNamesMask, xkb_desc);
     }