Replace autoconf metaclass magic

By using an "empty" intermediary class with the actual bases as the parent for the child class we can use the Python 2 and 3 compatible syntax

IntermediaryClass = JoinedMetaclass(IntermediaryClass, (BaseClass1, BaseClass2), {})

.gitignore

@@ -25,7 +25,6 @@ aclocal.m4
 install-sh
 .deps
 Constants.py
-/blueman/main/applet/BluezAgent.py
 /blueman/plugins/mechanism/Rfcomm.py
 _blueman.c
 po/Makefile.in.in

blueman/main/applet/BluezAgent.py.in → blueman/main/applet/BluezAgent.py

@@ -26,12 +26,13 @@ def __init__(self):
         dbus.DBusException.__init__(self, name="org.bluez.Error.Canceled")
 
 
-class DummyGObjectMeta(dbus.service.InterfaceType, GObjectMeta):
+class _GDbusObjectType(dbus.service.InterfaceType, GObjectMeta):
     pass
 
+_GObjectAgent = _GDbusObjectType('_GObjectAgent', (Agent, GObject.GObject), {})
 
-class CommonAgent(GObject.GObject, Agent@BLUEZ_AGENT_META@):
-    __metaclass__ = DummyGObjectMeta
+
+class CommonAgent(_GObjectAgent):
     __gsignals__ = {
         'released': (GObject.SignalFlags.NO_HOOKS, None, ()),
     }

blueman/main/applet/Makefile.am

@@ -4,8 +4,6 @@ blueman_PYTHON = 		\
 	Transfer.py			\
 	__init__.py	
 
-EXTRA_DIST = BluezAgent.py.in
-
 CLEANFILES =		\
 	BluezAgent.py	\
 	$(BUILT_SOURCES)

configure.ac

@@ -20,13 +20,6 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
 AC_SUBST(PYTHON_LIBS)
 AC_SUBST(PYTHON_CFLAGS)
 
-dnl Work around for Python3 metaclass class argument
-PYTHON_MAJOR_VERSION=`echo $PYTHON_VERSION | cut -c1`
-if test [$PYTHON_MAJOR_VERSION] = [3]; then
-   BLUEZ_AGENT_META=", metaclass=DummyGObjectMeta"
-   AC_SUBST(BLUEZ_AGENT_META)
-fi
-
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 
@@ -201,7 +194,6 @@ blueman/plugins/mechanism/Makefile
 blueman/plugins/mechanism/Rfcomm.py
 blueman/plugins/manager/Makefile
 blueman/main/Makefile
-blueman/main/applet/BluezAgent.py
 blueman/main/applet/Makefile
 blueman/ods/Makefile
 blueman/services/Makefile