diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-05 11:38:34 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-05 11:38:34 (GMT) |
| commit | c5ab58ed6c8bc2b9125782bc5a7bc6ac9d673eb7 (patch) | |
| tree | 00ea021cae105210db2ea10f30c73f710531e50b /sugar | |
| parent | 20ea0d7bccd9aecdd394d1570cbb87e63f3b3f18 (diff) | |
| parent | eab0e41d080d8987adfc7a95adb02bf433312616 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/datastore/dbus_helpers.py | 2 | ||||
| -rw-r--r-- | sugar/objects/objecttype.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py index 0f1b690..18c20ea 100644 --- a/sugar/datastore/dbus_helpers.py +++ b/sugar/datastore/dbus_helpers.py @@ -51,7 +51,7 @@ def delete(uid): def get_properties(uid): logging.debug('dbus_helpers.get_properties: %s' % uid) - return _data_store.get_properties(uid) + return _data_store.get_properties(uid, []) def get_filename(uid): filename = _data_store.get_filename(uid) diff --git a/sugar/objects/objecttype.py b/sugar/objects/objecttype.py index c0ece9b..dd2da54 100644 --- a/sugar/objects/objecttype.py +++ b/sugar/objects/objecttype.py @@ -25,16 +25,17 @@ def _object_type_from_dict(info_dict): if info_dict: return ObjectType(info_dict['type_id'], info_dict['name'], - info_dict['icon']) + info_dict['icon'], + info_dict['mime_types']) else: return None class ObjectType(object): - def __init__(self, type_id, name, icon): + def __init__(self, type_id, name, icon, mime_types): self.type_id = type_id self.name = name self.icon = icon - self.mime_types = [] + self.mime_types = mime_types class ObjectTypeRegistry(object): def __init__(self): |