From 49a8752eb514454abe9c1c78b3ef00c626da3bd3 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 19:43:45 +0200 Subject: [PATCH 1/6] Snapshot fa55b5af09. --- NEWS | 2 ++ po/POTFILES.in | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9fce1d55..cc874c37 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +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/po/POTFILES.in b/po/POTFILES.in index 8aec2664..c71aa55b 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 From d9b930e033f77b292b7adb0ba9b47a84b6a98f3a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 21:42:33 +0200 Subject: [PATCH 2/6] Remove objecttypeservice leftover --- services/shell/sugar-shell-service | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/shell/sugar-shell-service b/services/shell/sugar-shell-service index 7c057047..558e1beb 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() From 3c7578577dc1e09fd5e4a047135fbba5b090cf14 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 21:45:33 +0200 Subject: [PATCH 3/6] Update NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index cc874c37..487a5eac 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +* Fix the shell service (marco) + Snapshot fa55b5af09 * Changed default spacing to 15px (from 8px) (benzea) From fd194afff98fec1e530a99c8393173253e84282e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 21:46:33 +0200 Subject: [PATCH 4/6] Snapshot 3c7578577d. --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 487a5eac..544652b1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Snapshot 3c7578577d + * Fix the shell service (marco) Snapshot fa55b5af09 From 24fbd1ce1c9e401c611b7f830d9cb96b9531ff08 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 23:51:28 +0200 Subject: [PATCH 5/6] Fix the object chooser --- NEWS | 2 + lib/sugar/graphics/objectchooser.py | 1 - lib/sugar/objects/Makefile.am | 5 -- lib/sugar/objects/__init__.py | 16 ------ lib/sugar/objects/objecttype.py | 79 ----------------------------- 5 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 lib/sugar/objects/Makefile.am delete mode 100644 lib/sugar/objects/__init__.py delete mode 100644 lib/sugar/objects/objecttype.py diff --git a/NEWS b/NEWS index 544652b1..44faa863 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +* Fix the object chooser (marco) + Snapshot 3c7578577d * Fix the shell service (marco) diff --git a/lib/sugar/graphics/objectchooser.py b/lib/sugar/graphics/objectchooser.py index 7522a9d5..e099c3dc 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 0f898303..00000000 --- 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 85ebcede..00000000 --- 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 a8192168..00000000 --- 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 From 16d5afb66b248ce3721838d08eb90d1f918c03cc Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Oct 2007 23:53:08 +0200 Subject: [PATCH 6/6] Snapshot 24fbd1ce1c. --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 44faa863..8e8e843f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Snapshot 24fbd1ce1c + * Fix the object chooser (marco) Snapshot 3c7578577d