Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/datastore/datastore.py
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-09-14 14:16:54 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-09-14 14:16:54 (GMT)
commit0a666e23cf205b18003a464a7498a5d435cd1287 (patch)
treeeed18ebffbcb038b6f2185b134db96e64bb8e59f /sugar/datastore/datastore.py
parent4e18357902e39eebb00f0f33dad7e2becc668333 (diff)
When starting an activity with activity_id but no object_id
try to figure out from the journal which object it was associated to.
Diffstat (limited to 'sugar/datastore/datastore.py')
-rw-r--r--sugar/datastore/datastore.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 8fb30da..4a846bd 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -25,7 +25,6 @@ import gobject
from sugar.datastore import dbus_helpers
from sugar import activity
from sugar.activity.bundle import Bundle
-from sugar.activity import activityfactory
from sugar.activity.activityhandle import ActivityHandle
from sugar.bundle.contentbundle import ContentBundle
@@ -130,6 +129,8 @@ class DSObject(object):
'application/vnd.olpc-sugar']
def resume(self, service_name=None):
+ from sugar.activity import activityfactory
+
if self.is_bundle():
if service_name is not None:
raise ValueError('Object is a bundle, cannot be resumed as an activity.')