2009-06-08 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / pyatspi / deviceevent.py

diff --git a/pyatspi/deviceevent.py b/pyatspi/deviceevent.py
index b644224..e61d70b 100644 (file)
--- a/pyatspi/deviceevent.py
+++ b/pyatspi/deviceevent.py
@@ -174,6 +174,7 @@ class DeviceEvent(list):
                 @return: Event description
                 @rtype: string
                 """
+                import constants
                 if self.type == constants.KEY_PRESSED_EVENT:
                         kind = 'pressed'
                 elif self.type == constants.KEY_RELEASED_EVENT:
@@ -469,6 +470,7 @@ class KeyboardDeviceEventListener(_service.Object):
                 self._upath = self._get_unique_path()
                 _service.Object.__init__(self, registry._bus, self._upath)
                 self.mode = EventListenerMode(synchronous, preemptive, global_)
+                self._registry = registry
 
         def register(self, dc, key_set, mask, kind):
                 """
@@ -534,8 +536,14 @@ class KeyboardDeviceEventListener(_service.Object):
                         AT-SPI observers (False)?
                 @rtype: boolean
                 """
-                # wrap the device event
-                ev = event.DeviceEvent(ev)
-                return self.registry.handleDeviceEvent(ev, self)
+                # TODO Find out where the exceptions are falling in to.
+                try:
+                        # wrap the device event
+                        event = DeviceEvent(*ev)
+                        return self._registry.handleDeviceEvent(event, self)
+                except Exception, e:
+                        import traceback
+                        traceback.print_exc()
+                        return False
 
 #END---------------------------------------------------------------------------