diff options
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | lib/sugar/graphics/objectchooser.py | 1 | ||||
| -rw-r--r-- | lib/sugar/objects/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/sugar/objects/__init__.py | 16 | ||||
| -rw-r--r-- | lib/sugar/objects/objecttype.py | 79 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rwxr-xr-x | services/shell/sugar-shell-service | 2 |
7 files changed, 11 insertions, 104 deletions
@@ -1,4 +1,15 @@ * #4027 Try to make sugar.presence log messages less misleading (smcv) + +Snapshot 24fbd1ce1c + +* Fix the object chooser (marco) + +Snapshot 3c7578577d + +* Fix the shell service (marco) + +Snapshot fa55b5af09 + * Changed default spacing to 15px (from 8px) (benzea) * Correct the height of the primary palette (benzea) * Use double leading underscores for callback names to avoid name collisions (erikos) diff --git a/lib/sugar/graphics/objectchooser.py b/lib/sugar/graphics/objectchooser.py index 7522a9d..e099c3d 100644 --- a/lib/sugar/graphics/objectchooser.py +++ b/lib/sugar/graphics/objectchooser.py @@ -29,7 +29,6 @@ from sugar.graphics.xocolor import XoColor from sugar.graphics.roundbox import CanvasRoundBox from sugar.datastore import datastore from sugar import activity -from sugar.objects import objecttype # TODO: Activities should request the Journal to open objectchooser dialogs. In # that way, we'll be able to reuse most of this code inside the Journal. diff --git a/lib/sugar/objects/Makefile.am b/lib/sugar/objects/Makefile.am deleted file mode 100644 index 0f89830..0000000 --- a/lib/sugar/objects/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -sugardir = $(pythondir)/sugar/objects -sugar_PYTHON = \ - __init__.py \ - objecttype.py - diff --git a/lib/sugar/objects/__init__.py b/lib/sugar/objects/__init__.py deleted file mode 100644 index 85ebced..0000000 --- a/lib/sugar/objects/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2006-2007, Red Hat, Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. diff --git a/lib/sugar/objects/objecttype.py b/lib/sugar/objects/objecttype.py deleted file mode 100644 index a819216..0000000 --- a/lib/sugar/objects/objecttype.py +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (C) 2006-2007, Red Hat, Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -import dbus - -_SERVICE = "org.laptop.ObjectTypeRegistry" -_PATH = "/org/laptop/ObjectTypeRegistry" -_IFACE = "org.laptop.ObjectTypeRegistry" - -def _object_type_from_dict(info_dict): - if info_dict: - return ObjectType(info_dict['type_id'], - info_dict['name'], - info_dict['icon'], - info_dict['mime_types']) - else: - return None - -class ObjectType(object): - def __init__(self, type_id, name, icon, mime_types): - self.type_id = type_id - self.name = name - self.icon = icon - self.mime_types = mime_types - - self._type_id_to_type = {} - self._mime_type_to_type = {} - -class ObjectTypeRegistry(object): - def __init__(self): - bus = dbus.SessionBus() - bus_object = bus.get_object(_SERVICE, _PATH) - self._registry = dbus.Interface(bus_object, _IFACE) - - # Two caches fo saving some travel across dbus. - self._type_id_to_type = {} - self._mime_type_to_type = {} - - def get_type(self, type_id): - if self._type_id_to_type.has_key(type_id): - return self._type_id_to_type[type_id] - - type_dict = self._registry.GetType(type_id) - object_type = _object_type_from_dict(type_dict) - - self._type_id_to_type[type_id] = object_type - return object_type - - def get_type_for_mime(self, mime_type): - if self._mime_type_to_type.has_key(mime_type): - return self._mime_type_to_type[mime_type] - - type_dict = self._registry.GetTypeForMIME(mime_type) - object_type = _object_type_from_dict(type_dict) - - self._mime_type_to_type[mime_type] = object_type - return object_type - -_registry = None - -def get_registry(): - global _registry - if not _registry: - _registry = ObjectTypeRegistry() - return _registry diff --git a/po/POTFILES.in b/po/POTFILES.in index 8aec266..c71aa55 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,5 +11,4 @@ shell/view/devices/battery.py shell/view/devices/network/wireless.py shell/view/frame/activitybutton.py shell/view/frame/zoomtoolbar.py -services/shell/objecttypeservice.py lib/sugar/activity/activity.py diff --git a/services/shell/sugar-shell-service b/services/shell/sugar-shell-service index 7c05704..558e1be 100755 --- a/services/shell/sugar-shell-service +++ b/services/shell/sugar-shell-service @@ -30,7 +30,6 @@ from sugar import env sys.path.append(env.get_service_path('shell')) import clipboardservice -import objecttypeservice import activityregistryservice logging.info('Starting shell service.') @@ -39,7 +38,6 @@ gobject.threads_init() dbus.glib.threads_init() clipboard_service = clipboardservice.get_instance() -object_type_registry = objecttypeservice.get_instance() activity_registry = activityregistryservice.get_instance() loop = gobject.MainLoop() |