From bc49fc425755bc148649ae0934e06eb76eb1125c Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 12 Sep 2007 11:35:39 +0000
Subject: When joining an activity, pick up its sharing scope.

This avoids trying to re-share already shared activities in order to invite someone (#3364)
---
(limited to 'sugar')

diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index 4bda7eb..f18cb1c 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -520,11 +520,15 @@ class Activity(Window, gtk.Container):
         if not success:
             logging.debug("Failed to join activity: %s" % err)
             return
+        if self._shared_activity.props.private:
+            self._share_scope = SCOPE_INVITE_ONLY
+        else:
+            self._share_scope = SCOPE_NEIGHBORHOOD
+
         self.present()
         self.emit('joined')
         if self._jobject:
-            # FIXME: some way to distinguish between share scopes
-            self._jobject.metadata['share-scope'] = SCOPE_NEIGHBORHOOD
+            self._jobject.metadata['share-scope'] = self._share_scope
 
     def get_shared(self):
         """Returns TRUE if the activity is shared on the mesh."""
--
cgit v0.9.1