diff options
| -rw-r--r-- | services/clipboard/objecttypeservice.py | 3 | ||||
| -rw-r--r-- | sugar/datastore/dbus_helpers.py | 2 | ||||
| -rw-r--r-- | sugar/objects/objecttype.py | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/services/clipboard/objecttypeservice.py b/services/clipboard/objecttypeservice.py index 97f7d90..e12398e 100644 --- a/services/clipboard/objecttypeservice.py +++ b/services/clipboard/objecttypeservice.py @@ -31,7 +31,8 @@ class ObjectTypeRegistry(dbus.service.Object): from gettext import gettext as _ self._add_primitive('Text', _('Text'), 'theme:object-text', [ 'text/plain', 'text/rtf', 'application/pdf', - 'application/x-pdf', 'text/html' ]) + 'application/x-pdf', 'text/html', + 'application/vnd.oasis.opendocument.text' ]) self._add_primitive('Image', _('Image'), 'theme:object-image', [ 'image/png', 'image/gif', 'image/jpeg' ]) 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): |