diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 18:10:31 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 18:10:31 (GMT) |
| commit | 0965da57f1ea50fa4cae6c958d65adb049074ced (patch) | |
| tree | 07f23a9e10151b019e8c51c0a258fa68270a75cf | |
| parent | 5edd03b7cca51f11b909675b5c43430e254eb8f1 (diff) | |
activity, server_plugin: drop redundant information from join callback
| -rw-r--r-- | src/activity.py | 4 | ||||
| -rw-r--r-- | src/server_plugin.py | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/activity.py b/src/activity.py index c97e3e3..5f2360b 100644 --- a/src/activity.py +++ b/src/activity.py @@ -551,9 +551,7 @@ class Activity(ExportedGObject): else: self._joined_cb(tp, channel) - def _join_activity_create_channel_cb(self, tp, activity_id, handle, - chan_path): - assert activity_id == self._id + def _join_activity_create_channel_cb(self, handle, chan_path): self._room = handle channel = Channel(tp.get_connection().service_name, chan_path) diff --git a/src/server_plugin.py b/src/server_plugin.py index 5fab0f8..88652bc 100644 --- a/src/server_plugin.py +++ b/src/server_plugin.py @@ -485,8 +485,7 @@ class ServerPlugin(gobject.GObject): self._conn[CONN_INTERFACE].RequestChannel(CHANNEL_TYPE_TEXT, HANDLE_TYPE_ROOM, handles[0], True, - reply_handler=lambda path: callback(self, activity_id, - handles[0], path), + reply_handler=lambda path: callback(handles[0], path), error_handler=err_cb) def join_activity(self, activity_id, callback, err_cb): @@ -496,8 +495,6 @@ class ServerPlugin(gobject.GObject): activity_id -- unique ID for the activity callback -- callback to be called when the join succeeds or fails, with arguments: - self - activity ID: str activity room handle: int or long channel: object path err_cb -- callback to be called on failure, with one Exception argument |