--- rxvt-unicode/src/keyboard.C	2011/11/27 12:12:33	1.48
+++ rxvt-unicode/src/keyboard.C	2011/12/01 11:27:34	1.51
@@ -100,16 +100,11 @@
 
 keyboard_manager::~keyboard_manager ()
 {
-  hash [0] = 2;
-
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
       free (keymap [i]->str);
       delete keymap [i];
-      keymap [i] = 0;
     }
-
-  keymap.clear ();
 }
 
 // a wrapper for register_translation that converts the input string
@@ -117,9 +112,9 @@
 void
 keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
 {
-  wchar_t *wc = rxvt_mbstowcs (trans);
-  char *translation = rxvt_wcstoutf8 (wc);
-  free (wc);
+  wchar_t *ws = rxvt_mbstowcs (trans);
+  char *translation = rxvt_wcstoutf8 (ws);
+  free (ws);
 
   if (strncmp (translation, "list", 4) == 0 && translation [4]
       && strlen (translation) < STRING_MAX)
@@ -200,14 +195,14 @@
 
   if (index >= 0)
     {
-      const keysym_t &key = *keymap [index];
+      keysym_t *key = keymap [index];
 
-      if (key.type != keysym_t::BUILTIN)
+      if (key->type != keysym_t::BUILTIN)
         {
-          wchar_t *wc = rxvt_utf8towcs (key.str);
-          char *str = rxvt_wcstombs (wc);
+          wchar_t *ws = rxvt_utf8towcs (key->str);
+          char *str = rxvt_wcstombs (ws);
           // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
-          free (wc);
+          free (ws);
 
           output_string (term, str);