Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha@silbe.org>2009-07-20 12:15:08 (GMT)
committer Sascha Silbe <sascha@silbe.org>2009-08-17 20:52:47 (GMT)
commit2f4aa45dc1de6a2a6b26c7f3cebad8c5400a581f (patch)
tree2c3db4d73606e2152dbccdd684108f9c06f119a6
parent6ea8839eed76d37af78b59df76b35007ba473e62 (diff)
several fixes (cherry pick of b32ab14f31f1f527efdccc4019eb78472aa6a39d)
-rw-r--r--src/sugar/datastore/datastore.py4
1 files changed, 2 insertions, 2 deletions
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