Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2007-07-28 18:57:47 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2007-07-28 18:57:47 (GMT)
commit5b73d0dfceef32247f7a63cf0cc3ab37c48baca1 (patch)
treeb947a052f3a6d03d8c6f49386122a09fece37085 /sugar
parent099cd4d1b4d095e6f1c5b142a877a0a8cbe82f8b (diff)
Allow specifying a concrete activity when resuming a journal object.
Diffstat (limited to 'sugar')
-rw-r--r--sugar/datastore/datastore.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 256c12f..413f6d7 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -118,7 +118,7 @@ class DSObject(object):
def is_bundle(self):
return self.metadata['mime_type'] == 'application/vnd.olpc-x-sugar'
- def resume(self):
+ def resume(self, service_name=None):
if self.is_bundle():
bundle = Bundle(self.file_path)
if not bundle.is_installed():
@@ -126,7 +126,8 @@ class DSObject(object):
activityfactory.create(bundle.get_service_name())
else:
- service_name = self.get_activities()[0].service_name
+ if service_name is None:
+ service_name = self.get_activities()[0].service_name
activity_id = self.metadata['activity_id']
object_id = self.object_id