* registry.py: Fixed bug #436982 again (Patch from Eitan)

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@924 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/pyatspi/ChangeLog b/pyatspi/ChangeLog
index ef387f0..8b77833 100644 (file)
--- a/pyatspi/ChangeLog
+++ b/pyatspi/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-10  Peter Parente  <parente@cs.unc.edu>
+
+       * registry.py: Fixed bug #436982 again (Patch from Eitan)
+

 2007-05-09  Peter Parente  <parente@cs.unc.edu>
 
        * registry.py: Corrected patch for bug #436982 so it works with
 2007-05-09  Peter Parente  <parente@cs.unc.edu>
 
        * registry.py: Corrected patch for bug #436982 so it works with

diff --git a/pyatspi/registry.py b/pyatspi/registry.py
index eeed2b3..396c721 100644 (file)
--- a/pyatspi/registry.py
+++ b/pyatspi/registry.py
@@ -347,22 +347,17 @@ class Registry(object):
       i = gobject.idle_add(releaseGIL)
       
     # enter the main loop
       i = gobject.idle_add(releaseGIL)
       
     # enter the main loop

-    exc = None

     try:
       bonobo.main()
     try:
       bonobo.main()

-    except Exception, e:
-      # re-raise the keyboard interrupt later
-      exc = e
-
-    # clear all observers
-    for name, ob in self.observers.items():
-      ob.unregister(self.reg, name)
-    if gil:
-      gobject.source_remove(i)
-      exc = releaseGIL.keyboard_exception
-    if exc is not None:
-      # raise an keyboard exception we may have gotten earlier
-      raise exc  
+    finally:
+      # clear all observers
+      for name, ob in self.observers.items():
+        ob.unregister(self.reg, name)
+      if gil:
+        gobject.source_remove(i)
+        if releaseGIL.keyboard_exception is not None:
+          # raise an keyboard exception we may have gotten earlier
+          raise releaseGIL.keyboard_exception

 
   def stop(self, *args):
     '''Quits the main loop.'''
 
   def stop(self, *args):
     '''Quits the main loop.'''