Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/activity/activity.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-06-01 08:34:00 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-06-09 14:55:56 (GMT)
commit1ea1b2a0aba795c8ceba595158cb00cfe5590190 (patch)
tree2ff4ee832c2ccfacdd84dd088d3bebfbcea7a0f4 /src/sugar/activity/activity.py
parentc86b6d591733abcbe53dbb0b70c868dd2d94e28b (diff)
Use the activity instance name when joining a shared activity SL #2872
When we join a shared activity we use the name of the shared activity as the title of the activity. As we set the activity metadata accordingly this will be visible in the activity toolbar, the Journal and the activity frame. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'src/sugar/activity/activity.py')
-rw-r--r--src/sugar/activity/activity.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 5156725..31827da 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -336,6 +336,8 @@ class Activity(Window, gtk.Container):
def _initialize_journal_object(self):
title = _('%s Activity') % get_bundle_name()
+ if self.shared_activity and self.shared_activity.props.name != title:
+ title = self.shared_activity.props.name
if self.shared_activity is not None:
icon_color = self.shared_activity.props.color