applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a cancel button on the 'already used' dialog so that escape will close

Browse source 
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'
This commit is contained in:
Jody Goldberg 2004-04-01 05:59:55 +00:00 • committed by Jody Goldberg
parent 07571373a5
commit 18ba145029
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/keybindings/ChangeLog
View file

@ -1,3 +1,10 @@
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'
2003-12-30 Sven Herzberg <herzi@gnome-de.org>
* capplets/keybindings/eggcellrendererkeys.c : change the "Type a

10
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -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 ?

2
gnome-settings-daemon/eggaccelerators.c
View file

@ -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))