[vte/vte-0-34] keymap: Simplify debug code

[Christian Persch <chpe src gnome org>]

commit c396ff7573514db04e2cd66f0365e049adcd429c
Author: Christian Persch <chpe gnome org>
Date:   Mon Oct 8 21:58:14 2012 +0200

    keymap: Simplify debug code
    
    Remove the autogenerated keysyms.c and just use gdk_keyval_name().
    
    Conflicts:
    	src/Makefile.am

 src/Makefile.am   |    2 -
 src/genkeysyms.py |   27 --
 src/keymap.c      |   16 +-
 src/keysyms.c     | 1254 -----------------------------------------------------
 4 files changed, 4 insertions(+), 1295 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 9265f6e..abfe114 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,6 @@ header_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vte
 lib_LTLIBRARIES = libvte VTE_LIBRARY_SUFFIX_U@.la
 
 EXTRA_libvte VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
-	genkeysyms.py \
-	keysyms.c \
 	marshal.list \
 	mkunitables.sh \
 	unitable.CNS11643 \
diff --git a/src/keymap.c b/src/keymap.c
index 9a21669..6f5138c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */
 /*
  * Copyright (C) 2002,2003 Red Hat, Inc.
  *
@@ -16,7 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
@@ -54,16 +56,6 @@
 #endif
 
 #ifdef VTE_DEBUG
-static const char *
-_vte_keysym_name(guint keyval)
-{
-	switch (keyval) {
-#include "keysyms.c"
-		default:
-			break;
-	}
-	return "(unknown)";
-}
 static void
 _vte_keysym_print(guint keyval,
 		GdkModifierType modifiers,
@@ -85,7 +77,7 @@ _vte_keysym_print(guint keyval,
 	if (modifiers & GDK_SHIFT_MASK) {
 		g_printerr("Shift+");
 	}
-	g_printerr("%s" , _vte_keysym_name(keyval));
+	g_printerr("%s" , gdk_keyval_name(keyval));
 	if (sun_mode|hp_mode|legacy_mode|vt220_mode) {
 		gboolean first = TRUE;
 		g_printerr("(");