From bf87fdcc7eacc7c9699b218a508d3adad243e0d7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 25 Jul 2007 17:38:40 +0000
Subject: Fix Activity.GetChannels() - avoid trying to include the text channel object-path if there is no text channel yet

---
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.
--
cgit v0.9.1