gtk+ r20414 - in branches/gtk-2-12: . gdk/x11

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jun 17 02:13:46 2008
New Revision: 20414
URL: http://svn.gnome.org/viewvc/gtk+?rev=20414&view=rev

Log:
        * gdk/x11/gdkkeys-x11.c (_gdk_keymap_key_is_modifier): Protect
        against XKB being stupid. Reported by Pedro Villavicencio.




Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/x11/gdkkeys-x11.c

Modified: branches/gtk-2-12/gdk/x11/gdkkeys-x11.c
==============================================================================
--- branches/gtk-2-12/gdk/x11/gdkkeys-x11.c	(original)
+++ branches/gtk-2-12/gdk/x11/gdkkeys-x11.c	Tue Jun 17 02:13:46 2008
@@ -1661,7 +1661,7 @@
     {
       XkbDescRec *xkb = get_xkb (keymap_x11);
       
-      if (xkb->map->modmap[keycode] != 0)
+      if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
 	return TRUE;
     }
   else