From b8ec83c5b824592715a2fb5f10867ab281945a27 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 28 Sep 2007 14:32:22 +0000
Subject: This prevented activties whith no share-scope set to set the window title

---
(limited to 'sugar/activity/activity.py')

diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index 4c7cf5b..b3bbcba 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -287,16 +287,12 @@ class Activity(Window, gtk.Container):
             #self._jobject.object_id = ''
             #del self._jobject.metadata['ctime']
             del self._jobject.metadata['mtime']
+            
+            self.set_title(self._jobject.metadata['title'])
+                
+            if self._jobject.metadata.has_key('share-scope'):
+                share_scope = self._jobject.metadata['share-scope']                
 
-            if not self._jobject.metadata.has_key('title'):
-                self._jobject.metadata['title'] = ''
-
-            try:
-                share_scope = self._jobject.metadata['share-scope']
-                title = self._jobject.metadata['title']
-                self.set_title(title)
-            except KeyError:
-                pass
         elif create_jobject:
             logging.debug('Creating a jobject.')
             self._jobject = datastore.create()
--
cgit v0.9.1