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

[jensg svn gnome org]

Author: jensg
Date: Tue Jul 15 17:08:54 2008
New Revision: 393
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=393&view=rev

Log:
2008-07-15  Jens Granseuer  <jensgr gmx net>

	* plugins/common/gsd-keygrab.c: (match_key): always remove Shift
	from the consumed modifiers if we're matching the lowercase
	symbol to make more shortcuts with Shift work (bug #542275)


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	Tue Jul 15 17:08:54 2008
@@ -177,9 +177,10 @@
 
 		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)
+		/* If we are checking against the lower version of the
+		 * keysym, we might need the Shift state for matching,
+		 * so remove it from the consumed modifiers */
+		if (lower == key->keysym)
 			consumed &= ~GDK_SHIFT_MASK;
 
 		return ((lower == key->keysym || upper == key->keysym)