From 09076c4e2765ca96aa89b47de1cb4cf3e1a65c06 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Fri, 2 Feb 2007 23:22:15 +0000 Subject: [PATCH] filter out CapsLock modifiers since it's otherwise possible to set the 2007-02-03 Jens Granseuer * gnome-keybinding-properties.c: (accel_edited_callback): filter out CapsLock modifiers since it's otherwise possible to set the same accel for several actions (fixes #350424) svn path=/trunk/; revision=7232 --- capplets/keybindings/ChangeLog | 6 ++++++ capplets/keybindings/gnome-keybinding-properties.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 7fe2e4775..b639702bc 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,9 @@ +2007-02-03 Jens Granseuer + + * gnome-keybinding-properties.c: (accel_edited_callback): filter + out CapsLock modifiers since it's otherwise possible to set the + same accel for several actions (fixes #350424) + 2007-02-02 Jens Granseuer * gnome-keybinding-properties.c: (accel_edited_callback): blacklist diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 37fb77684..e11090a2b 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -636,6 +636,9 @@ accel_edited_callback (GtkCellRendererText *cell, if (key_entry == NULL) return; + /* CapsLock isn't supported as a keybinding modifier, so keep it from confusing us */ + mask &= ~EGG_VIRTUAL_LOCK_MASK; + model = get_real_model (view); tmp_key.model = model; tmp_key.keyval = keyval;