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-06-26 01:27:55 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-06-26 01:27:55 (GMT)
commitb179f0082fc5fd2a96f51759040b3a5cb84314ff (patch)
tree50db3c38407a30d99ecc891b3429a66f7f17beca
parent361ad792ea3833901b0c87650064b92908fdc49e (diff)
activity: Don't set properties if the CM doesn't support it (Salut doesn't).
-rw-r--r--src/activity.py13
1 files changed, 8 insertions, 5 deletions
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