diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2007-10-02 14:06:45 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2007-10-15 16:02:56 (GMT) |
| commit | 63050f39c2f9dff82bec10fe7ffce374b8124176 (patch) | |
| tree | 85bb9678d98577a3c37bdadb86d5a808f1489386 | |
| parent | ad03bc5d9b892f3360b272b5a63075d01065e1d0 (diff) | |
Remove dbus from self._dbus_tubes_channel - tubes channel supports any tubes type
| -rw-r--r-- | src/activity.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/activity.py b/src/activity.py index a58d474..c0f195d 100644 --- a/src/activity.py +++ b/src/activity.py @@ -170,7 +170,8 @@ class Activity(ExportedGObject): self._text_channel_group_flags = 0 #: list of SignalMatch associated with the text channel, or None self._text_channel_matches = None - self._dbus_tubes_channel = None + # telepathy.client.Channel: + self._tubes_channel = None self._valid = False self._id = None @@ -783,8 +784,8 @@ class Activity(ExportedGObject): else: self._joined_cb() - def _join_activity_create_dbus_tubes_cb(self, text_chan_path, - dbus_tubes_chan_path): + def _join_activity_create_tubes_cb(self, text_chan_path, + tubes_chan_path): text_channel = Channel(self._tp.get_connection().service_name, text_chan_path) self_ident = self._ps.owner.get_identifier_by_plugin(self._tp) @@ -794,10 +795,10 @@ class Activity(ExportedGObject): self._handle_to_buddy = {} self.NewChannel(text_channel.object_path) self._clean_up_matches() - dbus_tubes_channel = Channel(self._tp.get_connection().service_name, - dbus_tubes_chan_path) - self._dbus_tubes_channel = dbus_tubes_channel - self.NewChannel(dbus_tubes_channel.object_path) + tubes_channel = Channel(self._tp.get_connection().service_name, + tubes_chan_path) + self._tubes_channel = tubes_channel + self.NewChannel(tubes_channel.object_path) m = self._text_channel[CHANNEL_INTERFACE].connect_to_signal('Closed', self._text_channel_closed_cb) @@ -858,9 +859,9 @@ class Activity(ExportedGObject): conn = self._tp.get_connection() conn[CONN_INTERFACE].RequestChannel(CHANNEL_TYPE_TUBES, HANDLE_TYPE_ROOM, self._room, True, - reply_handler=lambda dbus_tubes_chan_path: \ - self._join_activity_create_dbus_tubes_cb( - text_chan_path, dbus_tubes_chan_path), + reply_handler=lambda tubes_chan_path: \ + self._join_activity_create_tubes_cb( + text_chan_path, tubes_chan_path), error_handler=self._join_failed_cb) def _join_activity_got_handles_cb(self, handles): @@ -939,8 +940,8 @@ class Activity(ExportedGObject): channels = [] if self._text_channel is not None: channels.append(self._text_channel.object_path) - if self._dbus_tubes_channel is not None: - channels.append(self._dbus_tubes_channel.object_path) + if self._tubes_channel is not None: + channels.append(self._tubes_channel.object_path) return (str(conn.service_name), conn.object_path, channels) def leave(self, async_cb, async_err_cb): |