summaryrefslogtreecommitdiff
path: root/gnome-settings-daemon
diff options
context:
space:
mode:
authorJody Goldberg <jody@gnome.org>2004-04-01 05:59:55 +0000
committerJody Goldberg <jody@src.gnome.org>2004-04-01 05:59:55 +0000
commit18ba14502912b861789b6e1d9d9387bdd22c3135 (patch)
tree3263e42dcdad2389eeaafb1f5284fe57e329f152 /gnome-settings-daemon
parent07571373a59b9ed802a1010b1a6e18d45530e50a (diff)
downloadgnome-control-center-18ba14502912b861789b6e1d9d9387bdd22c3135.tar.gz
Use a cancel button on the 'already used' dialog so that escape will close
2004-04-01 Jody Goldberg <jody@gnome.org> * gnome-keybinding-properties.c (accel_edited_callback) : Use a cancel button on the 'already used' dialog so that escape will close it. (cb_check_for_uniqueness) : fix brokeness. It is entirely possible for keycode on loaded keys to be '0'
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r--gnome-settings-daemon/eggaccelerators.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnome-settings-daemon/eggaccelerators.c b/gnome-settings-daemon/eggaccelerators.c
index 969be1262..0a39d519e 100644
--- a/gnome-settings-daemon/eggaccelerators.c
+++ b/gnome-settings-daemon/eggaccelerators.c
@@ -326,7 +326,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
{
keyval = gdk_keyval_from_name (accelerator);
- if (keyval == GDK_VoidSymbol)
+ if (keyval == 0)
{
/* If keyval is 0, than maybe it's a keycode. Check for 0x## */
if (len >= 4 && is_keycode (accelerator))