From 01c15298b81ce56e510f7ece46efa6a03aac46f9 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 16 Aug 2007 13:06:39 +0200 Subject: [PATCH] Adapt to object icons name changes. --- services/shell/objecttypeservice.py | 7 ++++--- shell/view/clipboardicon.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/shell/objecttypeservice.py b/services/shell/objecttypeservice.py index e12398ec..01e387da 100644 --- a/services/shell/objecttypeservice.py +++ b/services/shell/objecttypeservice.py @@ -17,6 +17,8 @@ import dbus import dbus.service +from gettext import gettext as _ + _REGISTRY_IFACE = "org.laptop.ObjectTypeRegistry" _REGISTRY_PATH = "/org/laptop/ObjectTypeRegistry" @@ -28,12 +30,11 @@ class ObjectTypeRegistry(dbus.service.Object): self._types = {} - from gettext import gettext as _ - self._add_primitive('Text', _('Text'), 'theme:object-text', + self._add_primitive('Text', _('Text'), 'theme:text', [ 'text/plain', 'text/rtf', 'application/pdf', 'application/x-pdf', 'text/html', 'application/vnd.oasis.opendocument.text' ]) - self._add_primitive('Image', _('Image'), 'theme:object-image', + self._add_primitive('Image', _('Image'), 'theme:image', [ 'image/png', 'image/gif', 'image/jpeg' ]) def _add_primitive(self, type_id, name, icon, mime_types): diff --git a/shell/view/clipboardicon.py b/shell/view/clipboardicon.py index 2e60e36b..c9d910a2 100644 --- a/shell/view/clipboardicon.py +++ b/shell/view/clipboardicon.py @@ -88,7 +88,7 @@ class ClipboardIcon(CanvasIcon): if icon_name: self.props.icon_name = icon_name else: - self.props.icon_name = 'theme:object-generic' + self.props.icon_name = 'theme:unknown-object' self._name = name self._percent = percent