From dd5b14eca75f0b28176ab839d7c2f2de8417ad47 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Tue, 16 Oct 2007 22:05:48 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
diff --git a/NEWS b/NEWS
index 3c0fd3b..c00ba7b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+66
+
+* Adapt to sugar API change (marco)
+
+65
+
 * Removed hack to set the right service name for sharing (erikos)
 * Removed the clipboard part from the download manager and added alerts (erikos)
 
diff --git a/activity/activity.info b/activity/activity.info
index 841c17b..981d4d2 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Browse
-activity_version = 64
+activity_version = 66
 service_name = org.laptop.WebActivity
 icon = activity-web
 exec = sugar-activity webactivity.WebActivity -s
diff --git a/downloadmanager.py b/downloadmanager.py
index e742a66..ebba6a2 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -29,7 +29,7 @@ import dbus
 
 from sugar.datastore import datastore
 from sugar import profile
-from sugar import objects
+from sugar import mime
 from sugar.graphics.alert import Alert, TimeoutAlert
 from sugar.graphics import style
 from sugar.graphics.icon import Icon
@@ -160,7 +160,7 @@ class Download:
             self._dl_jobject.file_path = self._target_file.path
 
             if self._mime_type == 'application/octet-stream':
-                sniffed_mime_type = objects.mime.get_for_file(self._target_file.path)
+                sniffed_mime_type = mime.get_for_file(self._target_file.path)
                 self._dl_jobject.metadata['mime_type'] = sniffed_mime_type
 
             datastore.write(self._dl_jobject,
--
cgit v0.9.1