[gnome-settings-daemon/gnome-3-2] common: Fix parsing of keycodes (again)

[Bastien Nocera <hadess src gnome org>]

commit e5959012d82b0160f8cdc6970741ff70241758b1
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Nov 10 14:25:02 2011 +0000

    common: Fix parsing of keycodes (again)
    
    0 != GDK_KEY_VoidSymbol

 plugins/common/eggaccelerators.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
index c3950ac..f16cbca 100644
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -348,12 +348,13 @@ egg_accelerator_parse_virtual (const gchar            *accelerator,
       else
 	{
 	  if (g_str_has_prefix (accelerator, "0x"))
-	    keyval = 0;
+	    keyval = GDK_KEY_VoidSymbol;
 	  else
             keyval = gdk_keyval_from_name (accelerator);
 
           if (keyval == GDK_KEY_VoidSymbol)
 	    {
+	      keyval = 0;
 	      /* If keyval is 0, then maybe it's a keycode.  Check for 0x## */
 	      if (len >= 4 && is_keycode (accelerator))
 		{