gnome-control-center r8609 - trunk/capplets/keybindings
- From: jensg svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-control-center r8609 - trunk/capplets/keybindings
- Date: Sat, 29 Mar 2008 13:29:57 +0000 (GMT)
Author: jensg
Date: Sat Mar 29 13:29:57 2008
New Revision: 8609
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8609&view=rev
Log:
2008-03-29 Jens Granseuer <jensgr gmx net>
* eggaccelerators.c: (egg_accelerator_parse_virtual): sync with
gnome-settings-daemon
Modified:
trunk/capplets/keybindings/ChangeLog
trunk/capplets/keybindings/eggaccelerators.c
Modified: trunk/capplets/keybindings/eggaccelerators.c
==============================================================================
--- trunk/capplets/keybindings/eggaccelerators.c (original)
+++ trunk/capplets/keybindings/eggaccelerators.c Sat Mar 29 13:29:57 2008
@@ -345,7 +345,7 @@
{
bad_keyval = TRUE;
}
- else
+ else if (keycode != NULL)
{
*keycode = tmp_keycode;
/* 0x00 is an invalid keycode too. */
@@ -354,6 +354,12 @@
}
}
}
+ else if (keycode != NULL)
+ {
+ *keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval);
+ if (*keycode == 0)
+ bad_keyval = TRUE;
+ }
accelerator += len;
len -= len;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]