[Pkg-sugar-commit] [sugar-toolkit] 05/06: Use the activity instance name when joining a shared activity SL #2872

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag v0.92.2
in repository sugar-toolkit.

commit ddb5da171542ac35d9af131a246a216a2b6d826e
Author: Simon Schampijer <simon at schampijer.de>
Date:   Wed Jun 1 10:34:00 2011 +0200

    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 at laptop.org>
    Acked-By: Sascha Silbe <silbe at activitycentral.com>
---
 src/sugar/activity/activity.py | 2 ++
 1 file changed, 2 insertions(+)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git