From 5b73d0dfceef32247f7a63cf0cc3ab37c48baca1 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Sat, 28 Jul 2007 18:57:47 +0000
Subject: Allow specifying a concrete activity when resuming a journal object.

---
(limited to 'sugar/datastore')

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
--
cgit v0.9.1