Merge http://people.freedesktop.org/~smcv/git/presence-service

1 files changed, 9 insertions, 0 deletions

diff --git a/src/activity.py b/src/activity.py
index 0cc16e7..019ac65 100644
--- a/src/activity.py
+++ b/src/activity.py
@@ -181,6 +181,11 @@ class Activity(ExportedGObject):
             assert self._room, self._room
             conn = self._tp.get_connection()
 
+            if CONN_INTERFACE_ACTIVITY_PROPERTIES not in conn:
+                # we should already have warned about this somewhere -
+                # certainly, don't emit a warning per activity!
+                return
+
             def got_properties_err(e):
                 _logger.warning('Failed to get initial activity properties '
                                 'for %s: %s', self._id, e)
@@ -817,6 +822,10 @@ class Activity(ExportedGObject):
 
         conn = self._tp.get_connection()
 
+        if CONN_INTERFACE_ACTIVITY_PROPERTIES not in conn:
+            # we should already have warned about this somewhere
+            return
+
         def properties_set(e=None):
             if e is None:
                 _logger.debug('Successfully set activity properties for %s',