Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

3 files changed, 6 insertions, 1 deletions

diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index a5661cd..f734c61 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -284,6 +284,9 @@ class Activity(Window, gtk.Container):
             #del self._jobject.metadata['ctime']
             del self._jobject.metadata['mtime']
 
+            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']
diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py
index b0e46ab..d2b1a89 100644
--- a/sugar/activity/bundlebuilder.py
+++ b/sugar/activity/bundlebuilder.py
@@ -230,7 +230,7 @@ def cmd_genpot(bundle_name, manifest):
     f.close()
 
     args = [ 'xgettext', '--join-existing', '--language=Python',
-             '--keyword=_', '--output=%s' % pot_file ]
+             '--keyword=_', '--add-comments=TRANS:', '--output=%s' % pot_file ]
 
     args += python_files
     retcode = subprocess.call(args)
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 0be6a2f..d4340fe 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -138,6 +138,8 @@ class DSObject(object):
 
             activityfactory.create(bundle.get_service_name())
         else:
+            if not self.get_activities():
+                return
             if service_name is None:
                 service_name = self.get_activities()[0].service_name