diff options
author | Sascha Silbe <sascha@silbe.org> | 2009-07-19 20:49:21 (GMT) |
---|---|---|
committer | Sascha Silbe <sascha@silbe.org> | 2009-08-17 20:43:23 (GMT) |
commit | 6ea8839eed76d37af78b59df76b35007ba473e62 (patch) | |
tree | 35f7f1a55589ab3aeafd7e96ddf15edf9a24bc11 | |
parent | c1f4949d05fb60168085634f57416a43e769971f (diff) |
sugar.datastore.datastore: some fixes, add DSMetadata.items()
-rw-r--r-- | src/sugar/datastore/datastore.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py index 9a7a6bf..b4a7861 100644 --- a/src/sugar/datastore/datastore.py +++ b/src/sugar/datastore/datastore.py @@ -68,7 +68,10 @@ class DSMetadata(gobject.GObject): def keys(self): return self._props.keys() - + + def items(self) : + return self._props.items() + def get_dictionary(self): return self._props @@ -265,7 +268,7 @@ class DatastoreListener(object): self._datastore = dbus_helpers._get_data_store() self._signal_handlers = [ self._datastore.connect_to_signal(sig_name[0].upper()+sig_name[1:], - getattr(self, "__datastore_%s_cb" % (sig_name,))) + getattr(self, "_datastore_%s_cb" % (sig_name,))) for sig_name in self._sig_names] for sig_name in self._sig_names : setattr(self, sig_name, dispatch.Signal()) @@ -279,18 +282,18 @@ class DatastoreListener(object): # have already been collected pass - def __datastore_created_cb(self, tree_id, version_id): - metadata = get_metadata((tree_id, version_id)) + def _datastore_created_cb(self, object_id): + metadata = get_metadata(object_id) self.saved.send(self, metadata=metadata) - def __datastore_updated_cb(self, tree_id, version_id): - metadata = get_metadata((tree_id, version_id)) - self.changedMetadata.send(self, metadata=metadata) + def _datastore_updated_cb(self, object_id): + metadata = get_metadata(object_id) + self.updated.send(self, metadata=metadata) - def __datastore_deleted_cb(self, tree_id, version_id): - self.deleted.send(self, object_id=(tree_id, version_id)) + def _datastore_deleted_cb(self, object_id): + self.deleted.send(self, object_id) - def __datastore_stopped(self): + def _datastore_stopped(self): self.stopped.send(self) |