[Pkg-sugar-commit] [sugar-toolkit] 04/05: Initialize window title with bundle name, OLPC #11037

[Jonas Smedegaard]

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

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

commit a122471de0db2e34ec4f1f8a4b63e2135e0dc2e3
Author: Simon Schampijer <simon at schampijer.de>
Date:   Sun Jul 24 19:19:04 2011 +0200

    Initialize window title with bundle name, OLPC #11037
    
    I had to modify the patch slightly because of
    0269f819761cfd803cf4d694298c8ab6a753e242, changes
    reviewed by Sascha.
    
    Signed-off-by: Gonzalo Odiard <gonzalo at laptop.org>
    Acked-By: Simon Schampijer <simon at laptop.org>
    Reviewed-by: Sascha Silbe <silbe at activitycentral.com>
---
 src/sugar/activity/activity.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index fce1a12..2c7d823 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -335,13 +335,17 @@ class Activity(Window, gtk.Container):
                                                   warn_if_none=False)
             self._set_up_sharing(mesh_instance, share_scope)
 
+        if not create_jobject:
+            self.set_title(get_bundle_name())
+            return
+
         if self.shared_activity is not None:
             self._jobject.metadata['title'] = self.shared_activity.props.name
             self._jobject.metadata['icon-color'] = \
                 self.shared_activity.props.color
-        self.set_title(self._jobject.metadata['title'])
-        self._jobject.metadata.connect('updated',
-                                       self.__jobject_updated_cb)
+            self.set_title(self._jobject.metadata['title'])
+            self._jobject.metadata.connect('updated',
+                                           self.__jobject_updated_cb)
 
     def _initialize_journal_object(self):
         title = _('%s Activity') % get_bundle_name()

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