diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2007-05-25 17:28:05 +0000 |
|---|---|---|
| committer | Jens Granseuer <jensg@src.gnome.org> | 2007-05-25 17:28:05 +0000 |
| commit | ec444482352036499d77c1dbe4c61de081ed2efc (patch) | |
| tree | b9137653748aebf0c97cd7d82e05eac958769964 | |
| parent | 82a2c1f64dfe5b4be0f5256918400d6238e548cf (diff) | |
| download | gnome-control-center-ec444482352036499d77c1dbe4c61de081ed2efc.tar.gz | |
sync with libegg code (closes bug #441042)
2007-05-25 Jens Granseuer <jensgr@gmx.net>
* eggaccelerators.c: (egg_accelerator_parse_virtual): sync with libegg
code (closes bug #441042)
svn path=/trunk/; revision=7657
| -rw-r--r-- | gnome-settings-daemon/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-settings-daemon/eggaccelerators.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 89904bb56..4d77fee4c 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,8 @@ +2007-05-25 Jens Granseuer <jensgr@gmx.net> + + * eggaccelerators.c: (egg_accelerator_parse_virtual): sync with libegg + code (closes bug #441042) + 2007-05-17 Jens Granseuer <jensgr@gmx.net> Patch by: Chad Miller diff --git a/gnome-settings-daemon/eggaccelerators.c b/gnome-settings-daemon/eggaccelerators.c index 0a39d519e..e719b7eca 100644 --- a/gnome-settings-daemon/eggaccelerators.c +++ b/gnome-settings-daemon/eggaccelerators.c @@ -352,8 +352,11 @@ egg_accelerator_parse_virtual (const gchar *accelerator, bad_keyval = TRUE; } } - } else if (keycode != NULL) + } else if (keycode != NULL) { *keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval); + if (*keycode == 0) + bad_keyval = TRUE; + } accelerator += len; len -= len; |