Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/journalactivity.py
diff options
context:
space:
mode:
authorDan Winship <dwinship@redhat.com>2007-09-20 19:58:53 (GMT)
committer Dan Winship <dwinship@redhat.com>2007-09-20 19:58:53 (GMT)
commit6eb09b29c5cba97cdfdb250c780baae967abd32d (patch)
tree5c7331082df7a10d2a51a6fad2a1fca1a7039d07 /journalactivity.py
parentd1ca2fd7324aa1cf8770b46b2d5619c6e3896c8d (diff)
update for ActivityBundle
Diffstat (limited to 'journalactivity.py')
-rwxr-xr-xjournalactivity.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/journalactivity.py b/journalactivity.py
index 0369616..e4cd03f 100755
--- a/journalactivity.py
+++ b/journalactivity.py
@@ -23,9 +23,9 @@ import dbus
from sugar.activity import activity
from sugar.activity.registry import get_registry as get_activity_registry
-from sugar.activity.bundle import Bundle
from sugar.bundle.bundle import MalformedBundleException, \
ZipExtractException, RegistrationException
+from sugar.bundle.activitybundle import ActivityBundle
from sugar.bundle.contentbundle import ContentBundle
from sugar.datastore import datastore
@@ -166,15 +166,15 @@ class JournalActivity(activity.Activity):
jobject.destroy()
def _check_for_bundle(self, jobject):
- if not (jobject.is_bundle() or jobject.is_content_bundle()):
+ if not jobject.is_bundle():
return
if jobject.file_path == '':
# Probably a download-in-progress
return
try:
- if jobject.is_bundle():
- bundle = Bundle(jobject.file_path)
+ if jobject.is_activity_bundle():
+ bundle = ActivityBundle(jobject.file_path)
else:
bundle = ContentBundle(jobject.file_path)
except MalformedBundleException, e: