Avoid misleading warning every time an activity starts (#4266)

2 files changed, 14 insertions, 13 deletions

diff --git a/lib/sugar/activity/activity.py b/lib/sugar/activity/activity.py
index 2acb26b..c0fccee 100644
--- a/lib/sugar/activity/activity.py
+++ b/lib/sugar/activity/activity.py
@@ -318,9 +318,11 @@ class Activity(Window, gtk.Container):
             self._jobject = None
 
         # handle activity share/join
-        mesh_instance = self._pservice.get_activity(self._activity_id)
-        logging.debug("*** Act %s, mesh instance %r, scope %s" % (self._activity_id, mesh_instance, share_scope))
-        if mesh_instance:
+        mesh_instance = self._pservice.get_activity(self._activity_id,
+                                                    warn_if_none=False)
+        logging.debug("*** Act %s, mesh instance %r, scope %s",
+                      self._activity_id, mesh_instance, share_scope)
+        if mesh_instance is not None:
             # There's already an instance on the mesh, join it
             logging.debug("*** Act %s joining existing mesh instance %r", self._activity_id, mesh_instance)
             self._shared_activity = mesh_instance
diff --git a/lib/sugar/presence/presenceservice.py b/lib/sugar/presence/presenceservice.py
index a9c834c..dea0c7c 100644
--- a/lib/sugar/presence/presenceservice.py
+++ b/lib/sugar/presence/presenceservice.py
@@ -302,21 +302,20 @@ class PresenceService(gobject.GObject):
              error_handler=lambda e:self._get_activities_error_cb(error_handler, e))
 
 
-    def get_activity(self, activity_id):
-        """Retrieve single Activity object for the given unique id 
-        
-        activity_id -- unique ID for the activity 
-        
-        returns single Activity object or None if the activity 
+    def get_activity(self, activity_id, warn_if_none=True):
+        """Retrieve single Activity object for the given unique id
+
+        activity_id -- unique ID for the activity
+
+        returns single Activity object or None if the activity
             is not found using GetActivityById on the service
         """
         try:
             act_op = self._ps.GetActivityById(activity_id)
         except dbus.exceptions.DBusException, err:
-            _logger.warn(
-                """Unable to retrieve activity handle for %r from presence service: %s"""
-                % (activity_id, err)
-            )
+            if warn_if_none:
+                _logger.warn("Unable to retrieve activity handle for %r from "
+                             "presence service: %s", activity_id, err)
             return None
         return self._new_object(act_op)