[pyatspi2/mgorse: 5/5] Merge branch 'master' into mgorse

[Mike Gorse <mgorse src gnome org>]

commit bb9ef05588728fe2389b6e582498f32ba5e55d99
Merge: 439ca75... dc6620d...
Author: Mike Gorse <mgorse novell com>
Date:   Mon Nov 9 14:50:33 2009 -0500

    Merge branch 'master' into mgorse
    
    Conflicts:
    	pyatspi/accessible.py

 pyatspi/Accessibility.py |    6 +-
 pyatspi/Makefile.am      |    1 -
 pyatspi/__init__.py      |    2 -
 pyatspi/accessible.py    |   41 +++++++++++--
 pyatspi/appevent.py      |   43 +++++++++++++-
 pyatspi/cache.py         |   40 ++-----------
 pyatspi/desktop.py       |    8 +++
 pyatspi/registry.py      |  141 ++++++++++++++++++++++++++++++++++++++++++++--
 pyatspi/settings.py      |  104 ----------------------------------
 pyatspi/utils.py         |    4 +-
 10 files changed, 226 insertions(+), 164 deletions(-)
---
diff --cc pyatspi/accessible.py
index a335ed1,30a90ca..7654f71
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@@ -197,8 -213,9 +213,11 @@@ class AccessibleImpl (BaseProxy)
                  return self.acc_factory.create_application(self.app_name)
  
          def getAttributes(self):
 -                func = self.get_dbus_method("getAttributes", dbus_interface=ATSPI_ACCESSIBLE)
 +                func = self.get_dbus_method("GetAttributes", dbus_interface=ATSPI_ACCESSIBLE)
 +                return [key + ':' + value for key, value in func().iteritems()]
++                func = self.get_dbus_method("GetAttributes", dbus_interface=ATSPI_ACCESSIBLE)
+                 attr = func ()
+                 return [key + ':' + value for key, value in attr.iteritems()]
  
          def getChildAtIndex(self, index):
                  count = Int32(self._pgetter(self.dbus_interface, "childCount"))
@@@ -217,8 -234,12 +236,12 @@@
                  relation_set = func()
                  return _marshal_relation_set(self.acc_factory, self._app_name, relation_set)
  
+         def getIndexInParent(self):
+                 func = self.get_dbus_method("getIndexInParent", dbus_interface=ATSPI_ACCESSIBLE)
+                 return func()
+ 
          def getRole(self):
 -                func = self.get_dbus_method("getRole", dbus_interface=ATSPI_ACCESSIBLE)
 +                func = self.get_dbus_method("GetRole", dbus_interface=ATSPI_ACCESSIBLE)
                  return func()
  
          def getRoleName(self):