[kupfer] Add dbuscompat to support dbus+gobject with dbus-python 1.0

[Ulrik Sverdrup <usverdrup src gnome org>]

commit a259639a80f9381d7bf7182863f9832b6676b20f
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Feb 13 22:01:58 2012 +0100

    Add dbuscompat to support dbus+gobject with dbus-python 1.0
    
    dbus-python has switched over to `gi` bindings and that makes it
    incompatible with Kupfer that is still using static gtk2 and glib
    bindings. We workaround this by copying gobject_service.py verbatim from
    dbus-python version 0.84.0. kupfer/dbuscompat.py is copyright collabora
    2007 and x11-licensed (GPL compatible).
    
    Launchpad-bug: https://bugs.launchpad.net/ubuntu/+source/kupfer/+bug/921829

 kupfer/dbuscompat.py |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 kupfer/ui/listen.py  |    4 ++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/kupfer/dbuscompat.py b/kupfer/dbuscompat.py
new file mode 100755
index 0000000..61a7749
--- /dev/null
+++ b/kupfer/dbuscompat.py
@@ -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 --git a/kupfer/ui/listen.py b/kupfer/ui/listen.py
index 3843662..ca894f0 100644
--- a/kupfer/ui/listen.py
+++ b/kupfer/ui/listen.py
@@ -4,10 +4,12 @@ and ensures there is only one unique service in the Session
 """
 
 import gobject
+
 try:
 	import dbus
 	import dbus.glib
-	from dbus.gobject_service import ExportedGObject
+	import dbus.service
+	from kupfer.dbuscompat import ExportedGObject
 
 # if dbus unavailable print the exception here
 # but further actions (register) will fail without warning