fixing keycode -1

svn path=/trunk/; revision=149

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ac4a8b..6667ba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-15 svu
+
+	* libgnomekbd/gkbd-keyboard-drawing.c: fixing keycode -1 handling,
+	http://bugzilla.gnome.org/show_bug.cgi?id=429907
+
 2007-08-13 svu
 
 	* libgnomekbd/gkbd-indicator-config.c: unneeded free, fixing crasher
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index eec296c..0f73466 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -32,6 +32,8 @@
 
 #define noKBDRAW_DEBUG
 
+#define INVALID_KEYCODE ((guint)(-1))
+
 enum {
 	BAD_KEYCODE = 0,
 	NUM_SIGNALS
@@ -536,7 +538,7 @@ find_keycode (GkbdKeyboardDrawing * drawing, gchar * key_name)
 	gchar *src, *dst;
 
 	if (!drawing->xkb)
-		return (gint) (-1);
+		return INVALID_KEYCODE;
 
 #ifdef KBDRAW_DEBUG
 	printf ("    looking for keycode for (%c%c%c%c)\n",
@@ -590,7 +592,7 @@ find_keycode (GkbdKeyboardDrawing * drawing, gchar * key_name)
 		palias++;
 	}
 
-	return (guint) (-1);
+	return INVALID_KEYCODE;
 }
 
 
@@ -1540,6 +1542,8 @@ init_keys_and_doodads (GkbdKeyboardDrawing * drawing)
 							      xkbkey->name.
 							      name);
 
+				if (keycode == INVALID_KEYCODE)
+					return;
 #ifdef KBDRAW_DEBUG
 				printf
 				    ("    initing key %d, shape: %p(%p + %d), code: %u\n",