* event.py (Event.__init__): Ref() the host_application attribute

if it is available (bug #492469).
* accessible.py (_makeExceptionHandler._inner): Revert patch from
bug #490202. This was the wrong fix. Objects that are returned
from methods are already reffed.

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

diff --git a/pyatspi/ChangeLog b/pyatspi/ChangeLog
index a86500079453ad1cad7c718a0d2f5ea5c90850a8..7b9434628b97b1563c76d48cc0b0ffc0843270b5 100644 (file)
--- a/pyatspi/ChangeLog
+++ b/pyatspi/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-01  Eitan Isaacson  <eitan@ascender.com>
+
+       * event.py (Event.__init__): Ref() the host_application attribute
+       if it is available (bug #492469).
+       * accessible.py (_makeExceptionHandler._inner): Revert patch from
+       bug #490202. This was the wrong fix. Objects that are returned
+       from methods are already reffed.
+
 2007-10-30  Eitan Isaacson  <eitan@ascender.com>
 
        * accessible.py (_AccessibleMixin.__del__): Catch TypeError 

diff --git a/pyatspi/accessible.py b/pyatspi/accessible.py
index f022ca26ee30a3f1d7780bc58a38fd586f9416c2..faf5b25421bfb9c250d187eeadd42260e8b6dc4d 100644 (file)
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@ -183,9 +183,7 @@ def _makeExceptionHandler(func):
   def _inner(self, *args, **kwargs):
     try:
       # try calling the original func
-      rv = func(self, *args, **kwargs)
-      if isinstance(rv, ORBit.CORBA.Object): rv.ref()
-      return rv
+      return func(self, *args, **kwargs)
     except ORBit.CORBA.NO_IMPLEMENT, e:
       # raise Python exception
       raise NotImplementedError(e)

diff --git a/pyatspi/event.py b/pyatspi/event.py
index bc230f2169d4f7a8c841919a42322603ec4ba4d4..4c581bd6aa91e166df338fe3210d59aeeed5bf57 100644 (file)
--- a/pyatspi/event.py
+++ b/pyatspi/event.py
@@ -168,6 +168,11 @@ class Event(object):
       self.any_data.ref()
     except AttributeError:
       pass
+    try:
+      # if we received a host application, be sure to increment the ref count
+      self.host_application.ref()
+    except AttributeError:
+      pass
 
   def __str__(self):
     '''