diff options
author | Simon Schampijer <simon@schampijer.de> | 2009-07-11 12:54:10 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2009-07-11 12:54:10 (GMT) |
commit | ed96c83df4469f13ea60a6ce48bca15f9d3759ed (patch) | |
tree | 011280effbc1df69507907a1517e7213e13c08ec | |
parent | 8dd6422fb3b6c1811e266ec1760a7ec8028bbbe7 (diff) | |
parent | 7ad6dacdfd97f0699c583195d9edab241220b979 (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
-rw-r--r-- | src/jarabe/view/keyhandler.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 08856c0..1f75851 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -22,6 +22,7 @@ import errno import traceback import sys +import gconf import dbus import gtk @@ -86,6 +87,8 @@ class KeyHandler(object): self._keystate_pressed = 0 self._speech_proxy = None + self._ungrab_metacity_keys() + self._key_grabber = KeyGrabber() self._key_grabber.connect('key-pressed', self._key_pressed_cb) @@ -111,6 +114,15 @@ class KeyHandler(object): self._key_grabber.grab_keys(_actions_table.keys()) + def _ungrab_metacity_keys(self): + """So we can grab those instead. + """ + client = gconf.client_get_default() + for key in ['run_command_screenshot', 'switch_windows', + 'cycle_windows']: + key = '/apps/metacity/global_keybindings/' + key + client.set_string(key, 'disabled') + def _change_volume(self, step=None, value=None): if step is not None: volume = sound.get_volume() + step |