File dbus-gobject-import.patch of Package sugar-toolkit
diff -ruN sugar-toolkit-0.96.3.orig/src/sugar/activity/activity.py sugar-toolkit-0.96.3/src/sugar/activity/activity.py
--- sugar-toolkit-0.96.3.orig/src/sugar/activity/activity.py 2012-06-06 05:34:27.000000000 +0800
+++ sugar-toolkit-0.96.3/src/sugar/activity/activity.py 2012-08-04 07:28:34.779982383 +0800
@@ -87,6 +87,17 @@
from sugar.activity.widgets import ActivityToolbox
+# XXX If dbus.gobject_service is GI based, monkey patch it
+# See http://bugs.sugarlabs.org/ticket/3539 for details
+try:
+ from dbus.gobject_service import ExportedGObject
+except ImportError:
+ import imp
+ file_, pathname_, description_ = imp.find_module('gobject_service',
+ [os.path.dirname(__file__)])
+ dbus.gobject_service = imp.load_module('dbus.gobject_service',
+ file_, pathname_, description_)
+
_ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
SCOPE_PRIVATE = 'private'
diff -ruN sugar-toolkit-0.96.3.orig/src/sugar/activity/gobject_service.py sugar-toolkit-0.96.3/src/sugar/activity/gobject_service.py
--- sugar-toolkit-0.96.3.orig/src/sugar/activity/gobject_service.py 1970-01-01 08:00:00.000000000 +0800
+++ sugar-toolkit-0.96.3/src/sugar/activity/gobject_service.py 2012-08-04 07:28:34.779982383 +0800
@@ -0,0 +1,71 @@
+"""Support code for implementing D-Bus services via GObjects."""
+
+# Copyright (C) 2007 Collabora Ltd. <http://www.collabora.co.uk/>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+import gobject
+import dbus.service
+
+class ExportedGObjectType(gobject.GObjectMeta, dbus.service.InterfaceType):
+ """A metaclass which inherits from both GObjectMeta and
+ `dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`.
+ """
+ def __init__(cls, name, bases, dct):
+ gobject.GObjectMeta.__init__(cls, name, bases, dct)
+ dbus.service.InterfaceType.__init__(cls, name, bases, dct)
+
+class ExportedGObject(gobject.GObject, dbus.service.Object):
+ """A GObject which is exported on the D-Bus.
+
+ Because GObject and `dbus.service.Object` both have custom metaclasses,
+ the naive approach using simple multiple inheritance won't work. This
+ class has `ExportedGObjectType` as its metaclass, which is sufficient
+ to make it work correctly.
+ """
+ __metaclass__ = ExportedGObjectType
+
+ def __init__(self, conn=None, object_path=None, **kwargs):
+ """Initialize an exported GObject.
+
+ :Parameters:
+ `conn` : dbus.connection.Connection
+ The D-Bus connection or bus
+ `object_path` : str
+ The object path at which to register this object.
+ :Keywords:
+ `bus_name` : dbus.service.BusName
+ A bus name to be held on behalf of this object, or None.
+ `gobject_properties` : dict
+ GObject properties to be set on the constructed object.
+
+ Any unrecognised keyword arguments will also be interpreted
+ as GObject properties.
+ """
+ bus_name = kwargs.pop('bus_name', None)
+ gobject_properties = kwargs.pop('gobject_properties', None)
+
+ if gobject_properties is not None:
+ kwargs.update(gobject_properties)
+ gobject.GObject.__init__(self, **kwargs)
+ dbus.service.Object.__init__(self, conn=conn,
+ object_path=object_path,
+ bus_name=bus_name)
diff -ruN sugar-toolkit-0.96.3.orig/src/sugar/activity/Makefile.am sugar-toolkit-0.96.3/src/sugar/activity/Makefile.am
--- sugar-toolkit-0.96.3.orig/src/sugar/activity/Makefile.am 2012-05-16 17:10:27.000000000 +0800
+++ sugar-toolkit-0.96.3/src/sugar/activity/Makefile.am 2012-08-04 07:30:20.217981576 +0800
@@ -6,5 +6,6 @@
activityhandle.py \
activityservice.py \
bundlebuilder.py \
+ gobject_service.py \
i18n.py \
widgets.py
diff -ruN sugar-toolkit-0.96.3.orig/src/sugar/activity/Makefile.in sugar-toolkit-0.96.3/src/sugar/activity/Makefile.in
--- sugar-toolkit-0.96.3.orig/src/sugar/activity/Makefile.in 2012-06-06 05:38:06.000000000 +0800
+++ sugar-toolkit-0.96.3/src/sugar/activity/Makefile.in 2012-08-04 07:30:26.495981597 +0800
@@ -251,6 +251,7 @@
activityhandle.py \
activityservice.py \
bundlebuilder.py \
+ gobject_service.py \
i18n.py \
widgets.py
