Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rwxr-xr-xactivity/activity.info2
-rw-r--r--downloadmanager.py1
3 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index be97145..61b1f0f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
+78
+
+<<<<<<< HEAD:NEWS
77
+=======
+* Give to the DS the ownership of the files we hand to it #5235 (tomeu)
+>>>>>>> d347f616e9d1177aae343ac9d0d04df51c2c6078:NEWS
* Open an uri of type text/uri-list with browse #5080 (erikos)
* Save view source to SAR/instance #5251 (erikos)
* Move the profile in SAR/data #5221 (erikos)
diff --git a/activity/activity.info b/activity/activity.info
index a03d0a0..ef598ae 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Browse
-activity_version = 77
+activity_version = 78
service_name = org.laptop.WebActivity
icon = activity-web
exec = sugar-activity webactivity.WebActivity -s
diff --git a/downloadmanager.py b/downloadmanager.py
index f129c0a..07374f1 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -167,6 +167,7 @@ class Download:
self._dl_jobject.metadata['mime_type'] = sniffed_mime_type
datastore.write(self._dl_jobject,
+ transfer_ownership=True,
reply_handler=self._internal_save_cb,
error_handler=self._internal_save_error_cb,
timeout=360 * DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND)