Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-07-25 17:38:40 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-07-25 17:38:40 (GMT)
commitbf87fdcc7eacc7c9699b218a508d3adad243e0d7 (patch)
tree0a234e85dacbabd10d5907011fa09eb7611d6633
parent082cfdee716b994a72347c4b033d40c195466680 (diff)
Fix Activity.GetChannels() - avoid trying to include the text channel object-path if there is no text channel yet
-rw-r--r--src/activity.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/activity.py b/src/activity.py
index 019ac65..873fcb7 100644
--- a/src/activity.py
+++ b/src/activity.py
@@ -698,8 +698,10 @@ class Activity(ExportedGObject):
"""
conn = self._tp.get_connection()
# FIXME add tubes and others channels
- return (str(conn.service_name), conn.object_path,
- [self._text_channel.object_path])
+ channels = []
+ if self._text_channel is not None:
+ channels.append(self._text_channel.object_path)
+ return (str(conn.service_name), conn.object_path, channels)
def leave(self, async_cb, async_err_cb):
"""Local method for the local user to leave the shared activity.