Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-07-02 13:13:42 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-20 13:33:52 (GMT)
commit9c1275e4c8dd0c7369c3e5da391db13ed254a442 (patch)
tree83926ba5de801fe9e5d006b965da0fba4ef13e0e
parent043d3b0ee739480fd6d8ca9f203937948ac483e5 (diff)
Implement Activity.get_channels()
-rw-r--r--src/sugar/presence/activity.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sugar/presence/activity.py b/src/sugar/presence/activity.py
index 21997d9..4d11a67 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):