--- rxvt-unicode/src/keyboard.C	2011/05/07 18:29:18	1.42
+++ rxvt-unicode/src/keyboard.C	2011/11/27 09:19:04	1.45
@@ -80,8 +80,8 @@
 compare_priority (keysym_t *a, keysym_t *b)
 {
   // (the more '1's in state; the less range): the greater priority
-  int ca = rxvt_popcount (a->state /* & OtherModMask */);
-  int cb = rxvt_popcount (b->state /* & OtherModMask */);
+  int ca = ecb_popcount32 (a->state /* & OtherModMask */);
+  int cb = ecb_popcount32 (b->state /* & OtherModMask */);
 
   if (ca != cb)
     return ca - cb;
@@ -110,7 +110,7 @@
 
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
-      free ((void *)keymap [i]->str);
+      free (keymap [i]->str);
       delete keymap [i];
       keymap [i] = 0;
     }
@@ -179,7 +179,7 @@
   else
     {
       delete key;
-      free ((void *)translation);
+      free (translation);
       rxvt_fatal ("out of memory, aborting.\n");
     }
 }
@@ -227,12 +227,7 @@
           // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
           free (wc);
 
-          switch (key.type)
-            {
-              case keysym_t::STRING:
-                output_string (term, str);
-                break;
-            }
+          output_string (term, str);
 
           free (str);