sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When joining an activity, pick up its sharing scope.

Browse Source 
This avoids trying to re-share already shared activities in order to invite someone (#3364)
This commit is contained in:
Simon McVittie 2007-09-12 12:35:39 +01:00
parent ac73c3950a
commit bc49fc4257
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,3 +1,6 @@
* #3364: When joining an activity, pick up its sharing scope, so we don't
try to re-share already shared activities in order to invite someone (smcv)
Snapshot 8b784a6223 Snapshot 8b784a6223
* #3339 Add default mime types handler to the shell. (marco) * #3339 Add default mime types handler to the shell. (marco)

8
sugar/activity/activity.py
View File

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