#------------------------------------------------------------------------------
-def _marshal_relation_set(cache, dbus_object, app_name, relation_set):
+def _marshal_relation_set(cache, app_name, relation_set):
"""
The D-Bus protocol has a relation set passed as an array of
relation types and object arrays.
This function marshals the D-Bus message into a list of relation
objects.
"""
- return [Relation(cache, dbus_object, app_name, *relation) for relation in relation_set]
+ return [Relation(cache, app_name, *relation) for relation in relation_set]
#------------------------------------------------------------------------------
a "one-to-many" correspondance.
"""
- def __init__(self, cache, dbus_object, app_name, type, objects):
+ def __init__(self, cache, app_name, type, objects):
self._type = type
self._objects = objects
- self._dbus_object = dbus_object
self._cache = cache
self._app_name = app_name
self._app_name,
self._objects[index],
interfaces.ATSPI_ACCESSIBLE,
- dbus_object=self._dbus_object)
+ connection=self._cache._connection)
#END----------------------------------------------------------------------------