diff options
author | Bastien Nocera <hadess@hadess.net> | 2008-03-31 12:29:49 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2008-03-31 12:29:49 +0000 |
commit | 04d6b6038d3047bb48bdec1d4b1e11a29404d504 (patch) | |
tree | 6159fc9a23877cee3c9d5e127a5f9a80c481a7b7 | |
parent | 7c66cbc00a2ff83dd2993fc49b19a22af96fbafa (diff) | |
download | gnome-control-center-04d6b6038d3047bb48bdec1d4b1e11a29404d504.tar.gz |
Fix Esc and Backspace being bindable when Caps Lock is on (Closes:
2008-03-31 Bastien Nocera <hadess@hadess.net>
* eggcellrendererkeys.c (grab_key_callback): Fix Esc and Backspace
being bindable when Caps Lock is on (Closes: #524813)
svn path=/trunk/; revision=8615
-rw-r--r-- | capplets/keybindings/ChangeLog | 5 | ||||
-rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 1c32fb710..c7872c72a 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,5 +1,10 @@ 2008-03-31 Bastien Nocera <hadess@hadess.net> + * eggcellrendererkeys.c (grab_key_callback): Fix Esc and Backspace + being bindable when Caps Lock is on (Closes: #524813) + +2008-03-31 Bastien Nocera <hadess@hadess.net> + * gnome-keybinding-properties.c (append_keys_to_tree_from_file): Fix category headers not appearing properly in the treeview when using a non-UTF-8 locale (Closes: #513988) diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 133fa4fda..648acb353 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -421,7 +421,8 @@ grab_key_callback (GtkWidget *widget, egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (), EGG_VIRTUAL_NUM_LOCK_MASK | - EGG_VIRTUAL_SCROLL_LOCK_MASK, + EGG_VIRTUAL_SCROLL_LOCK_MASK | + EGG_VIRTUAL_LOCK_MASK, &ignored_modifiers); /* http://bugzilla.gnome.org/show_bug.cgi?id=139605 |