Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2008-10-20 13:00:55 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2008-10-20 13:00:55 (GMT)
commit10348e680b54e3a22df4d1c16fdfddb706995024 (patch)
tree1a7ad69d6188a6e7592682799e87048920221292
parent830781046c957f5e300bf71e7c3e09d3c5417c25 (diff)
Fix resume after refactoring
-rw-r--r--src/jarabe/journal/misc.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 269f238..19322ad 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -177,13 +177,15 @@ def resume(jobject, bundle_id=None):
activity_bundle = registry.get_bundle(activities[0].get_bundle_id())
activityfactory.create_with_uri(activity_bundle, bundle.get_start_uri())
else:
- if not get_activities(jobject) and bundle_id is None:
- logging.warning('No activity can open this object, %s.' %
- jobject.metadata.get('mime_type', None))
- return
if bundle_id is None:
- bundle_id = get_activities(jobject)[0].get_bundle_id()
- bundle = registry.get_bundle(bundle_id)
+ activities = get_activities(jobject)
+ if not activities:
+ logging.warning('No activity can open this object, %s.' %
+ jobject.metadata.get('mime_type', None))
+ return
+ bundle_id = activities[0].get_bundle_id()
+
+ bundle = registry.get_bundle(bundle_id)
activity_id = jobject.metadata['activity_id']
object_id = jobject.object_id