diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-30 22:22:14 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-30 22:22:14 (GMT) |
| commit | ca3c990dc12522d3305db27f1e3d2ad8922572f5 (patch) | |
| tree | b2bceb94bcee3f2ff5fc4f52ad55b2346b3761f3 /shell | |
| parent | 335e5c89d007272ad388bd3aa9900fd66f6eee7b (diff) | |
Handle missing TakeScreenshot method gracefully
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/view/Shell.py | 5 | ||||
| -rw-r--r-- | shell/view/keyhandler.py | 22 |
2 files changed, 4 insertions, 23 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 541fb2e..c5c4867 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -172,7 +172,10 @@ class Shell(gobject.GObject): home_model = self._model.get_home() activity = home_model.get_active_activity() if activity: - activity.get_service().TakeScreenshot() + try: + activity.get_service().TakeScreenshot(timeout=1.0) + except dbus.DBusException, e: + logging.debug('ignoring error raised by TakeScreenshot(): %s', e) def set_zoom_level(self, level): if level == self._zoom_level: diff --git a/shell/view/keyhandler.py b/shell/view/keyhandler.py index 768b6c3..26a9fd5 100644 --- a/shell/view/keyhandler.py +++ b/shell/view/keyhandler.py @@ -71,8 +71,6 @@ class KeyHandler(object): self._key_grabber = KeyGrabber() self._key_grabber.connect('key-pressed', self._key_pressed_cb) - self._key_grabber.connect('key-released', - self._key_released_cb) for key in _actions_table.keys(): self._key_grabber.grab(key) @@ -197,23 +195,3 @@ class KeyHandler(object): return True return False - - def _key_released_cb(self, grabber, keycode, state): - if self._keycode_pressed == keycode: - self._keycode_pressed = 0 - - if self._keystate_pressed == state: - self._keystate_pressed = 0 - - if not self._keycode_pressed and not self._keystate_pressed and \ - self._key_pressed: - gtk.gdk.keyboard_ungrab(time=0L) - - if self._key_pressed == '<alt>f': - self._shell.get_frame().notify_key_release() - elif self._key_pressed == '0x93': - self._shell.get_frame().notify_key_release() - - return True - - return False |