Fix clean-up (temporary files, thumbnails) after saving

sugar.datastore.datastore.create() still cannot be called asynchronously, so
we need to "emulate" it.

1 files changed, 11 insertions, 3 deletions

diff --git a/scan.py b/scan.py
index cf685c6..978742e 100644
--- a/scan.py
+++ b/scan.py
@@ -692,9 +692,17 @@ class ScanActivity(activity.Activity):
         # TODO: add tags, description etc.
         jobject.file_path = name
         self._save_button.set_sensitive(False)
-        datastore.write(jobject, transfer_ownership=True,
-            reply_handler=self._save_reply_cb,
-            error_handler=self._save_error_cb)
+        # async not supported, see SL#3071
+        #datastore.write(jobject, transfer_ownership=True,
+        #    reply_handler=self._save_reply_cb,
+        #    error_handler=self._save_error_cb)
+        try:
+            datastore.write(jobject, transfer_ownership=True)
+        except Exception, exception:
+            self._save_error_cb(exception)
+        else:
+            self._save_reply_cb()
+
         jobject.destroy()
 
     @trace()