From 18ba14502912b861789b6e1d9d9387bdd22c3135 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Thu, 1 Apr 2004 05:59:55 +0000 Subject: [PATCH] Use a cancel button on the 'already used' dialog so that escape will close 2004-04-01 Jody Goldberg * 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' --- capplets/keybindings/ChangeLog | 7 +++++++ capplets/keybindings/gnome-keybinding-properties.c | 10 +++++----- gnome-settings-daemon/eggaccelerators.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index e22a6f93d..7efcd7b5e 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,10 @@ +2004-04-01 Jody Goldberg + + * 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' + 2003-12-30 Sven Herzberg * capplets/keybindings/eggcellrendererkeys.c : change the "Type a diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index e681ddcd2..86dbadc0c 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -672,11 +672,11 @@ cb_check_for_uniqueness (GtkTreeModel *model, -1); if (tmp_key_entry != NULL && - key_entry->keyval == tmp_key_entry->keyval && - key_entry->mask == tmp_key_entry->mask && - key_entry->keycode == tmp_key_entry->keycode && + strcmp (key_entry->gconf_key, tmp_key_entry->gconf_key) != 0 && + ((key_entry->keyval == tmp_key_entry->keyval && + key_entry->mask == tmp_key_entry->mask) || + key_entry->keycode == tmp_key_entry->keycode)) /* be sure we don't claim a key is a dup of itself */ - strcmp (key_entry->gconf_key, tmp_key_entry->gconf_key) != 0) { key_entry->editable = FALSE; key_entry->gconf_key = tmp_key_entry->gconf_key; @@ -737,7 +737,7 @@ accel_edited_callback (GtkCellRendererText *cell, gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, + GTK_BUTTONS_CANCEL, _("The shortcut \"%s\" is already used for:\n \"%s\"\n"), name, tmp_key.description ? 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))