diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 16:29:00 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-07 16:29:00 (GMT) |
| commit | ab02ebfa7f5de90b5f1c3b99aa80da8daa968e7d (patch) | |
| tree | 9731b15b7057b2009fe889f08a0a2121a10febe3 | |
| parent | c2b34fe63dac71ef97fe8fde49816797d432b884 (diff) | |
server_plugin: Emit activity-joined with correct arguments
| -rw-r--r-- | src/server_plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server_plugin.py b/src/server_plugin.py index f966d0c..4c47683 100644 --- a/src/server_plugin.py +++ b/src/server_plugin.py @@ -482,7 +482,7 @@ class ServerPlugin(gobject.GObject): channel, userdata): self._joined_activities.append((activity_id, handle)) self._set_self_activities() - self.emit('activity-joined', activity_id, channel, None, userdata) + self.emit('activity-joined', activity_id, handle, channel, None, userdata) def _join_activity_channel_props_listed_cb(self, activity_id, handle, channel, userdata, @@ -533,7 +533,7 @@ class ServerPlugin(gobject.GObject): if (activity_id, handles[0]) in self._joined_activities: e = RuntimeError("Already joined activity %s" % activity_id) _logger.debug('%s', e) - self.emit('activity-joined', activity_id, None, e, userdata) + self.emit('activity-joined', activity_id, handles[0], None, e, userdata) return self._conn[CONN_INTERFACE].RequestChannel(CHANNEL_TYPE_TEXT, @@ -548,7 +548,7 @@ class ServerPlugin(gobject.GObject): e = Exception("Error joining/sharing activity %s: (%s): %s" % (activity_id, where, err)) _logger.debug('%s', e) - self.emit('activity-joined', activity_id, None, e, userdata) + self.emit('activity-joined', activity_id, 0, None, e, userdata) def _internal_join_activity(self, activity_id, userdata): handle = self._activities.get(activity_id) |