diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 16:05:45 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 16:05:45 (GMT) |
| commit | 102b0c48d0edde7cfcd53bc0229e572da51d6045 (patch) | |
| tree | 313c4cc87785840619a055479c6af9f49b52dc08 | |
| parent | f866aaa99859770d25e44bb07ae3e943e13d6093 (diff) | |
Make Activity._share signature the same as Activity.join
| -rw-r--r-- | src/activity.py | 2 | ||||
| -rw-r--r-- | src/presenceservice.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/activity.py b/src/activity.py index a32de9a..42bcf29 100644 --- a/src/activity.py +++ b/src/activity.py @@ -519,7 +519,7 @@ class Activity(ExportedGObject): async_cb(dbus.ObjectPath(self._object_path)) _logger.debug("Share of activity %s succeeded." % self._id) - def _share(self, (async_cb, async_err_cb), owner): + def _share(self, async_cb, async_err_cb, owner): """XXX - not documented yet XXX - This method is called externally by the PresenceService diff --git a/src/presenceservice.py b/src/presenceservice.py index 70759ff..ee188fe 100644 --- a/src/presenceservice.py +++ b/src/presenceservice.py @@ -453,7 +453,7 @@ class PresenceService(ExportedGObject): def ShareActivity(self, actid, atype, name, properties, async_cb, async_err_cb): self._share_activity(actid, atype, name, properties, - (async_cb, async_err_cb)) + async_cb, async_err_cb) @dbus.service.method(_PRESENCE_INTERFACE, in_signature='', out_signature="so") @@ -465,7 +465,8 @@ class PresenceService(ExportedGObject): for tp in self._handles_buddies: tp.cleanup() - def _share_activity(self, actid, atype, name, properties, callbacks): + def _share_activity(self, actid, atype, name, properties, async_cb, + async_err_cb): objid = self._get_next_object_id() # FIXME check which tp client we should use to share the activity color = self._owner.props.color @@ -476,7 +477,7 @@ class PresenceService(ExportedGObject): activity.connect("validity-changed", self._activity_validity_changed_cb) self._activities[actid] = activity - activity._share(callbacks, self._owner) + activity._share(async_cb, async_err_cb, self._owner) # local activities are valid at creation by definition, but we can't # connect to the activity's validity-changed signal until its already |