diff options
author | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-20 10:40:25 (GMT) |
---|---|---|
committer | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-20 10:40:25 (GMT) |
commit | ada0de8ea44b79cfe25aebadd608e71a0083b860 (patch) | |
tree | 4a2dd53a29a89b1cdcb2067b6733c4cc9ed56e23 | |
parent | 1093834b297c85f43524c79cc1c4b7bb812b26de (diff) | |
parent | 9abf32d6a0081d34115d1ca91605e473980dc4e8 (diff) |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
-rw-r--r-- | src/jarabe/view/keyhandler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 517f30b..64329f8 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -164,9 +164,6 @@ class KeyHandler(object): journalactivity.get_journal().show_journal() def _key_pressed_cb(self, grabber, keycode, state, event_time): - if not self._key_handlers_active: - return - key = grabber.get_key(keycode, state) logging.debug('_key_pressed_cb: %i %i %s', keycode, state, key) if key is not None: @@ -185,6 +182,9 @@ class KeyHandler(object): if hasattr(action, 'handle_key_press'): action.handle_key_press(key) elif isinstance(action, basestring): + if not self._key_handlers_active: + return + method = getattr(self, 'handle_' + action) method(event_time) else: |