Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Marco Pesenti Gritti
2007-07-05 13:38:34 +02:00
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -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)
+4 -3
View File
@@ -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):