diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 17:07:12 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 17:07:12 (GMT) |
| commit | 14fb0f1464c672120c5f1e624b5e1b6ec9840f03 (patch) | |
| tree | 91ef204ba887e0f7b8f240ac01e75fd3d6f54448 | |
| parent | feebc5ee689597f23cfa04df627d4e4f507111b5 (diff) | |
activity, server_plugin: simplify successful join handling
| -rw-r--r-- | src/activity.py | 2 | ||||
| -rw-r--r-- | src/server_plugin.py | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/activity.py b/src/activity.py index 706c2b3..897700a 100644 --- a/src/activity.py +++ b/src/activity.py @@ -505,6 +505,8 @@ class Activity(ExportedGObject): """ assert activity_id == self.props.id + tp.emit_joined_activity(activity_id, room_handle) + self._room = room_handle verb = self._join_is_sharing and 'Share' or 'Join' diff --git a/src/server_plugin.py b/src/server_plugin.py index 15ec73a..98293cc 100644 --- a/src/server_plugin.py +++ b/src/server_plugin.py @@ -472,11 +472,6 @@ class ServerPlugin(gobject.GObject): self._joined_activities.append((activity_id, room)) self._set_self_activities() - def _join_activity_channel_props_set_cb(self, activity_id, handle, - channel, callback, err_cb): - self.emit_joined_activity(activity_id, handle) - callback(self, activity_id, handle, channel) - def _join_activity_channel_props_listed_cb(self, activity_id, handle, channel, callback, err_cb, props, prop_specs): @@ -493,12 +488,11 @@ class ServerPlugin(gobject.GObject): if props_to_set: channel[PROPERTIES_INTERFACE].SetProperties(props_to_set, - reply_handler=lambda: self._join_activity_channel_props_set_cb( - activity_id, handle, channel, callback, err_cb), + reply_handler=lambda: callback(self, activity_id, handle, + channel) error_handler=err_cb) else: - self._join_activity_channel_props_set_cb(activity_id, - handle, channel, callback, err_cb) + callback(self, activity_id, handle, channel) def _join_activity_create_channel_cb(self, activity_id, handle, callback, err_cb, chan_path): |