From b179f0082fc5fd2a96f51759040b3a5cb84314ff Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 26 Jun 2007 01:27:55 +0000
Subject: activity: Don't set properties if the CM doesn't support it (Salut doesn't).

---
diff --git a/src/activity.py b/src/activity.py
index e47ad4e..bb761fb 100644
--- a/src/activity.py
+++ b/src/activity.py
@@ -603,11 +603,14 @@ class Activity(ExportedGObject):
 
     def _join_activity_create_channel_cb(self, chan_path):
         channel = Channel(self._tp.get_connection().service_name, chan_path)
-        channel[PROPERTIES_INTERFACE].ListProperties(
-            reply_handler=lambda prop_specs:
-                self._join_activity_channel_props_listed_cb(
-                    channel, prop_specs),
-            error_handler=self._join_failed_cb)
+        if PROPERTIES_INTERFACE not in channel:
+            self._join_activity_channel_props_listed_cb(channel, ())
+        else:
+            channel[PROPERTIES_INTERFACE].ListProperties(
+                reply_handler=lambda prop_specs:
+                    self._join_activity_channel_props_listed_cb(
+                        channel, prop_specs),
+                error_handler=self._join_failed_cb)
 
     def _join_activity_got_handles_cb(self, handles):
         assert len(handles) == 1
--
cgit v0.9.1