repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 53eb3ab7bee3c8fcba584235b154d460c86d912e:
path_to: 
revision_to: 
git.thebackupbox.net
rxvt-unicode-sixel
git clone git://git.thebackupbox.net/rxvt-unicode-sixel
commit 53eb3ab7bee3c8fcba584235b154d460c86d912e
Author: Emanuele Giaquinta 
Date:   Sat Dec 3 11:31:56 2011 +0000

    merge register_translation in register_user_translation.

diff --git a/src/keyboard.C b/src/keyboard.C
index ff83e669451e87e4669906107b0272016259a1e5..
index ..37ddb91761598ea2d852b011b66f9fe9c2f9232a 100644
--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -107,19 +107,11 @@ keyboard_manager::~keyboard_manager ()
     }
 }

-// a wrapper for register_translation that converts the input string
-// to utf-8 and expands 'list' syntax.
 void
 keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
 {
   char *translation = rxvt_wcstoutf8 (ws);

-  register_translation (keysym, state, translation);
-}
-
-void
-keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
-{
   keysym_t *key = new keysym_t;

   if (key && translation)
diff --git a/src/keyboard.h b/src/keyboard.h
index 5a244fbcf32308cd803b7073b2b318a648316f99..
index ..f7c58ba9ba30dacbd71be7e9242a3bfa016ff709 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -69,7 +69,6 @@ public:
   ~keyboard_manager ();

   void register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws);
-  void register_translation (KeySym keysym, unsigned int state, char *translation);
   void register_done ();        // call this to make newly registered key bindings take effect
   bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);

-----END OF PAGE-----