[gtk-vnc] Fix typo in keycode names & improve error message



commit 511c554256f08911cec77b305ef82e633a6bbc9f
Author: Daniel P. Berrange <berrange redhat com>
Date:   Fri Aug 20 16:25:48 2010 +0100

    Fix typo in keycode names & improve error message
    
    Fix typo in evdev keycode names left over from debugging. Improve
    the error message when finding unknown keycodes

 src/vncdisplaykeymap.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index 80d5edc..c1e9af1 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -124,7 +124,7 @@ const guint16 const *vnc_display_keymap_gdk2rfb_table(size_t *maplen)
 		VNC_DEBUG("Using xquartz keycode mapping");
 		*maplen = G_N_ELEMENTS(keymap_xorgxquartz2rfb);
 		return keymap_xorgxquartz2rfb;
-	} else if (keycodes && STRPREFIX(keycodes, "e2vdev_")) {
+	} else if (keycodes && STRPREFIX(keycodes, "evdev_")) {
 		VNC_DEBUG("Using evdev keycode mapping");
 		*maplen = G_N_ELEMENTS(keymap_xorgevdev2rfb);
 		return keymap_xorgevdev2rfb;
@@ -133,15 +133,16 @@ const guint16 const *vnc_display_keymap_gdk2rfb_table(size_t *maplen)
 		*maplen = G_N_ELEMENTS(keymap_xorgkbd2rfb);
 		return keymap_xorgkbd2rfb;
 	} else {
-               g_warning("Unknown keycode mapping.\n"
-                          "Please report to gtk-vnc-list gnome org\n"
+               g_warning("Unknown keycode mapping '%s'.\n"
+			 "Please report to gtk-vnc-list gnome org\n"
                          "including the following information:\n"
                          "\n"
                          "  - Operating system\n"
                          "  - GTK build\n"
                          "  - X11 Server\n"
                          "  - xprop -root\n"
-                         "  - xdpyinfo\n");
+                         "  - xdpyinfo\n",
+			 keycodes);
                return NULL;
 	}
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]