Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rwxr-xr-xactivity/activity.info2
-rw-r--r--downloadmanager.py2
-rwxr-xr-xwebactivity.py2
-rwxr-xr-xwebtoolbar.py2
5 files changed, 10 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index dc9e410..02de197 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+64
+
+63
+
+* Fix crash on startup. (marco)
* #3552: Cancel a donwload when the related journal entry is deleted. (tomeu)
62
diff --git a/activity/activity.info b/activity/activity.info
index 2b4eeb0..841c17b 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Browse
-activity_version = 62
+activity_version = 64
service_name = org.laptop.WebActivity
icon = activity-web
exec = sugar-activity webactivity.WebActivity -s
diff --git a/downloadmanager.py b/downloadmanager.py
index 5176807..d9ccfac 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -188,7 +188,9 @@ class Download:
activities = []
for activity_info in activities_info:
activities.append(activity_info)
+ logging.debug('--> act=%s mime=%s'%(activities, self._mime_type))
bundle_id = activities[0].bundle_id
+ logging.debug('--> bundle_id=%s'%bundle_id)
activityfactory.create_with_object_id(bundle_id, self._object_id)
_activity.remove_alert(alert)
diff --git a/webactivity.py b/webactivity.py
index af39f06..bca8531 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -117,7 +117,7 @@ class WebActivity(activity.Activity):
if handle.uri:
self._browser.load_uri(handle.uri)
- elif not self._jobject.file_path:
+ elif not self._jobject.file_path:
# TODO: we need this hack until we extend the activity API for
# opening URIs and default docs.
self._load_homepage()
diff --git a/webtoolbar.py b/webtoolbar.py
index 1b86606..104c439 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -25,7 +25,7 @@ from xpcom.components import interfaces
from xpcom import components
from sugar.graphics.toolbutton import ToolButton
-from sugar._sugaruiext import AddressEntry
+from sugar._sugarext import AddressEntry
import sessionhistory
import progresslistener