From 2f4aa45dc1de6a2a6b26c7f3cebad8c5400a581f Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha@silbe.org>
Date: Mon, 20 Jul 2009 12:15:08 +0000
Subject: several fixes (cherry pick of b32ab14f31f1f527efdccc4019eb78472aa6a39d)

---
diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index b4a7861..0a19c28 100644
--- a/src/sugar/datastore/datastore.py
+++ b/src/sugar/datastore/datastore.py
@@ -41,7 +41,7 @@ class DSMetadata(gobject.GObject):
         if not props:
             self._props = {}
         else:
-            self._props = props
+            self._props = dict(props)
         
         default_keys = ['activity', 'activity_id',
                         'mime_type', 'title_set_by_user']
@@ -144,7 +144,7 @@ class DSObject(object):
 
 def get(object_id):
     logging.debug('datastore.get %r', object_id)
-    metadata = dbus_helpers.get_properties(object_id)
+    metadata = get_metadata(object_id)
 
     ds_object = DSObject(object_id, DSMetadata(metadata), None)
     # TODO: register the object for updates
--
cgit v0.9.1