diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-31 11:22:49 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-08-31 11:22:49 +0800 |
| commit | aeb7032c694cae6fd8e86a236e95e938ce0f0ac4 (patch) | |
| tree | c7ca8de649c38e688665bc105370be0dd7504228 | |
| parent | fd0e130388b93cf6c8729d88d5642060c3ec1c15 (diff) | |
| download | ibus-aeb7032c694cae6fd8e86a236e95e938ce0f0ac4.tar.gz ibus-aeb7032c694cae6fd8e86a236e95e938ce0f0ac4.tar.xz ibus-aeb7032c694cae6fd8e86a236e95e938ce0f0ac4.zip | |
Use name_to_keycode to convert name to keyval.
| -rw-r--r-- | daemon/bus.py | 6 | ||||
| -rw-r--r-- | setup/keyboardshortcut.py | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/daemon/bus.py b/daemon/bus.py index d27911c..5b648de 100644 --- a/daemon/bus.py +++ b/daemon/bus.py @@ -493,9 +493,9 @@ class IBus(ibus.Object): if name in keys[:-1]: keymask |= mask keyname = keys[-1] - if keyname[0] in "1234567890": - keyname = "_" + keyname - keyval = keysyms.__dict__.get(keyname, 0) + keyval = keysyms.name_to_keycode(keyname) + if keyval == None: + keyval = 0 return keyval, keymask diff --git a/setup/keyboardshortcut.py b/setup/keyboardshortcut.py index 051cffc..c667903 100644 --- a/setup/keyboardshortcut.py +++ b/setup/keyboardshortcut.py @@ -27,7 +27,6 @@ __all__ = ( import gobject import gtk from gtk import gdk -from gtk import keysyms from gettext import dgettext _ = lambda a : dgettext("ibus", a) |