gnome-settings-daemon r373 - in trunk: . plugins/common

[jensg svn gnome org]

Author: jensg
Date: Fri Jun 13 16:45:59 2008
New Revision: 373
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=373&view=rev

Log:
2008-06-13  Jens Granseuer  <jensgr gmx net>

	Based on a patch by: Bastien Nocera <hadess hadess net>

	* plugins/common/gsd-keygrab.c: (match_key): properly match
	keybindings that need Shift for resolving the keysym (bug #536581)


Modified:
   trunk/ChangeLog
   trunk/plugins/common/gsd-keygrab.c

Modified: trunk/plugins/common/gsd-keygrab.c
==============================================================================
--- trunk/plugins/common/gsd-keygrab.c	(original)
+++ trunk/plugins/common/gsd-keygrab.c	Fri Jun 13 16:45:59 2008
@@ -173,6 +173,12 @@
 		guint lower, upper;
 
 		gdk_keyval_convert_case (keyval, &lower, &upper);
+
+		/* If we don't have different keysyms depending on the
+		 * shift state, remove the shift state from the consumed */
+		if (upper == lower)
+			consumed &= ~GDK_SHIFT_MASK;
+
 		return ((lower == key->keysym || upper == key->keysym)
 			&& (key->state & ~consumed & GSD_USED_MODS) == key->state);
 	}