diff options
author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-03-14 12:32:05 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-03-14 12:32:05 (GMT) |
commit | 6227b962153552299ec5825dd279d3de0835c670 (patch) | |
tree | f2158cf7f5d771bd36acceb6d681a4fad25aa815 /services | |
parent | 8b4ccf3eb10d0563344e123f7f2c773bba120a2f (diff) |
Support selection of the clipboard object to be pasted.
Diffstat (limited to 'services')
-rw-r--r-- | services/clipboard/clipboardservice.py | 2 | ||||
-rw-r--r-- | services/clipboard/typeregistry.py | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/services/clipboard/clipboardservice.py b/services/clipboard/clipboardservice.py index 282dfd3..8fb0ff4 100644 --- a/services/clipboard/clipboardservice.py +++ b/services/clipboard/clipboardservice.py @@ -100,7 +100,7 @@ class ClipboardDBusServiceHelper(dbus.service.Object): def get_object(self, object_path): cb_object = self._objects[str(object_path)] formats = cb_object.get_formats() - format_types = [] + format_types = dbus.Array([], 's') for type, format in formats.iteritems(): format_types.append(type) diff --git a/services/clipboard/typeregistry.py b/services/clipboard/typeregistry.py index 3f42ad5..3e46895 100644 --- a/services/clipboard/typeregistry.py +++ b/services/clipboard/typeregistry.py @@ -34,7 +34,7 @@ class TextFileType(FileType): def get_preview(self): for format, data in self._formats.iteritems(): if format in TextFileType._types: - text = str(data.get_data()) + text = data.get_data() if len(text) < 50: return text else: @@ -43,7 +43,7 @@ class TextFileType(FileType): return '' def get_activity(self): - return '' + return 'org.laptop.AbiWordActivity' def matches_mime_type(cls, mime_type): return mime_type in cls._types @@ -135,21 +135,12 @@ class MsWordFileType(FileType): return mime_type in cls._types matches_mime_type = classmethod(matches_mime_type) -class RtfFileType(FileType): +class RtfFileType(TextFileType): _types = set(['application/rtf', 'text/rtf']) def get_name(self): return _('RTF file') - - def get_icon(self): - return 'theme:object-text' - - def get_preview(self): - return '' - - def get_activity(self): - return 'org.laptop.AbiWordActivity' def matches_mime_type(cls, mime_type): return mime_type in cls._types |