2008-12-04 Mark Doffman <mark.doffman@codethink.co.uk>

        * pyatspi/accessible.py
        * pyatspi/accessiblecache.py
          Modify the cache adding a stateset.
          Modify the getState function to use the
          cached values.

diff --git a/pyatspi/accessible.py b/pyatspi/accessible.py
index c9323a8..e86b73b 100644 (file)
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@ -207,9 +207,7 @@ class Accessible(BaseProxy):
         @return : a StateSet encapsulating the currently true states
         of the object.
         """
-        func = self.get_dbus_method("getState", dbus_interface=ATSPI_ACCESSIBLE)
-        bitfield = func()
-        return _marshal_state_set(bitfield)
+        return _marshal_state_set(self.cached_data.state)
 
     def isEqual(self, accessible):
         """

diff --git a/pyatspi/accessiblecache.py b/pyatspi/accessiblecache.py
index 15a3353..fd35b85 100644 (file)
--- a/pyatspi/accessiblecache.py
+++ b/pyatspi/accessiblecache.py
@@ -26,6 +26,7 @@ class _CacheData(object):
                         'role',
                         'name',
                         'description',
+                        'state',
                     ]
 
         def __init__(self, data):
@@ -39,7 +40,8 @@ class _CacheData(object):
                 self.interfaces,
                 self.name,
                 self.role,
-                self.description) = data
+                self.description,
+                self.state) = data
 
 #------------------------------------------------------------------------------