From ca3c990dc12522d3305db27f1e3d2ad8922572f5 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Tue, 30 Oct 2007 23:22:14 +0100
Subject: [PATCH] Handle missing TakeScreenshot method gracefully

---
 NEWS                     |  1 +
 shell/view/Shell.py      |  5 ++++-
 shell/view/keyhandler.py | 22 ----------------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 8c31a979..a505c626 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #4517 Do not require a TakeScreenshot method on the dbus service (marco)
 * Add wep type combo. (dcbw)
 
 Snapshot 8c89bfaed7
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index 541fb2e5..c5c48676 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 768b6c30..26a9fd5c 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