From 9c1275e4c8dd0c7369c3e5da391db13ed254a442 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Fri, 2 Jul 2010 15:13:42 +0200 Subject: [PATCH] Implement Activity.get_channels() --- src/sugar/presence/activity.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sugar/presence/activity.py b/src/sugar/presence/activity.py index 21997d96..4d11a674 100644 --- a/src/sugar/presence/activity.py +++ b/src/sugar/presence/activity.py @@ -410,10 +410,14 @@ class Activity(gobject.GObject): - a list of D-Bus object paths representing the channels associated with this activity """ - (bus_name, connection, channels) = self._activity.GetChannels() + bus_name = self.telepathy_conn.requested_bus_name + connection_path = self.telepathy_conn.object_path + channels = [self.telepathy_text_chan.object_path, + self.telepathy_tubes_chan.object_path] + _logger.debug('%r: bus name is %s, connection is %s, channels are %r', - self, bus_name, connection, channels) - return bus_name, connection, channels + self, bus_name, connection_path, channels) + return bus_name, connection_path, channels # Leaving def __text_channel_closed_cb(self):