From ec444482352036499d77c1dbe4c61de081ed2efc Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Fri, 25 May 2007 17:28:05 +0000
Subject: [PATCH] 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
---
 gnome-settings-daemon/ChangeLog         | 5 +++++
 gnome-settings-daemon/eggaccelerators.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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;