commit 6537c0e7be556b00d70268198d0511506d8628f3
Author: Dieter Verfaillie <dieterv@optionexplicit.be>
Date:   Wed Jun 29 20:53:00 2011 +0200

    Fix gdbus_codegen package

diff --git a/configure.ac b/configure.ac
index 91c053f..bdf3f6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3790,8 +3790,8 @@ gobject/tests/Makefile
 gthread/Makefile
 gthread/tests/Makefile
 gio/Makefile
-gio/gdbus-codegen/Makefile
-gio/gdbus-codegen/config.py
+gio/gdbus/codegen/Makefile
+gio/gdbus/codegen/config.py
 gio/xdgmime/Makefile
 gio/inotify/Makefile
 gio/libasyncns/Makefile
diff --git a/gio/.gitignore b/gio/.gitignore
index f27b2dc..495a32a 100644
--- a/gio/.gitignore
+++ b/gio/.gitignore
@@ -3,7 +3,6 @@ gio-querymodules
 gio-marshal.[ch]
 gioenumtypes.[ch]
 glib-compile-schemas
-gdbus
 gsettings
 gdbus-example-objectmanager-generated.[ch]
 gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 157f85e..1b03e53 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 NULL =
 
-SUBDIRS = gdbus-codegen
+SUBDIRS = gdbus/codegen
 
 if OS_UNIX
 SUBDIRS += libasyncns xdgmime
diff --git a/gio/gdbus-codegen/.gitignore b/gio/gdbus-codegen/.gitignore
deleted file mode 100644
index 2d1abb9..0000000
--- a/gio/gdbus-codegen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pyc
-gdbus-codegen
diff --git a/gio/gdbus-codegen/Makefile.am b/gio/gdbus-codegen/Makefile.am
deleted file mode 100644
index dc596d7..0000000
--- a/gio/gdbus-codegen/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-NULL =
-bin_SCRIPTS =
-CLEANFILES =
-EXTRA_DIST =
-
-codegendir = $(libdir)/gdbus-codegen
-codegen_PYTHON =						\
-	__init__.py						\
-	codegen.py						\
-	codegen_main.py						\
-	codegen_docbook.py					\
-	config.py						\
-	dbustypes.py						\
-	parser.py						\
-	utils.py						\
-	$(NULL)
-
-CLEANFILES += config.pyc
-
-bin_SCRIPTS += gdbus-codegen
-CLEANFILES += gdbus-codegen
-EXTRA_DIST += gdbus-codegen.in
-
-gdbus-codegen: gdbus-codegen.in Makefile
-	$(AM_V_GEN) sed -e 's,@libdir\@,$(libdir),' -e 's,@PYTHON\@,$(PYTHON),' $< > $@.tmp && mv $@.tmp $@
-	@chmod a+x $@
-
-clean-local:
-	rm -f *~
diff --git a/gio/gdbus-codegen/__init__.py b/gio/gdbus-codegen/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/gio/gdbus-codegen/codegen.py b/gio/gdbus-codegen/codegen.py
deleted file mode 100644
index c4112e5..0000000
--- a/gio/gdbus-codegen/codegen.py
+++ /dev/null
@@ -1,3107 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import sys
-
-import config
-import utils
-import dbustypes
-
-# ----------------------------------------------------------------------------------------------------
-
-class CodeGenerator:
-    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, docbook_gen, h, c):
-        self.docbook_gen = docbook_gen
-        self.generate_objmanager = generate_objmanager
-        self.ifaces = ifaces
-        self.h = h
-        self.c = c
-        self.namespace = namespace
-        if len(namespace) > 1:
-            self.ns_upper = utils.camel_case_to_uscore(namespace).upper() + '_'
-            self.ns_lower = utils.camel_case_to_uscore(namespace).lower() + '_'
-        else:
-            self.ns_upper = ''
-            self.ns_lower = ''
-        self.interface_prefix = interface_prefix
-        self.header_guard = self.h.name.upper().replace('.', '_').replace('-', '_')
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def generate_intro(self):
-        self.c.write('/*\n'
-                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
-                     ' *\n'
-                     ' * The license of this code is the same as for the source it was derived from.\n'
-                     ' */\n'
-                     '\n'
-                     %(config.VERSION))
-        self.c.write('#ifdef HAVE_CONFIG_H\n'
-                     '#  include "config.h"\n'
-                     '#endif\n'
-                     '\n'
-                     '#include "%s"\n'
-                     '\n'%(self.h.name))
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  GDBusArgInfo parent_struct;\n'
-                     '  gboolean use_gvariant;\n'
-                     '} _ExtendedGDBusArgInfo;\n'
-                     '\n')
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  GDBusMethodInfo parent_struct;\n'
-                     '  const gchar *signal_name;\n'
-                     '} _ExtendedGDBusMethodInfo;\n'
-                     '\n')
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  GDBusSignalInfo parent_struct;\n'
-                     '  const gchar *signal_name;\n'
-                     '} _ExtendedGDBusSignalInfo;\n'
-                     '\n')
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  GDBusPropertyInfo parent_struct;\n'
-                     '  const gchar *hyphen_name;\n'
-                     '  gboolean use_gvariant;\n'
-                     '} _ExtendedGDBusPropertyInfo;\n'
-                     '\n')
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  GDBusInterfaceInfo parent_struct;\n'
-                     '  const gchar *hyphen_name;\n'
-                     '} _ExtendedGDBusInterfaceInfo;\n'
-                     '\n')
-
-        self.c.write('typedef struct\n'
-                     '{\n'
-                     '  const _ExtendedGDBusPropertyInfo *info;\n'
-                     '  guint prop_id;\n'
-                     '  GValue orig_value; /* the value before the change */\n'
-                     '} ChangedProperty;\n'
-                     '\n'
-                     'static void\n'
-                     '_changed_property_free (ChangedProperty *data)\n'
-                     '{\n'
-                     '  g_value_unset (&data->orig_value);\n'
-                     '  g_free (data);\n'
-                     '}\n'
-                     '\n')
-
-        self.c.write('static gboolean\n'
-                     '_g_strv_equal0 (gchar **a, gchar **b)\n'
-                     '{\n'
-                     '  gboolean ret = FALSE;\n'
-                     '  guint n;\n'
-                     '  if (a == NULL && b == NULL)\n'
-                     '    {\n'
-                     '      ret = TRUE;\n'
-                     '      goto out;\n'
-                     '    }\n'
-                     '  if (a == NULL || b == NULL)\n'
-                     '    goto out;\n'
-                     '  if (g_strv_length (a) != g_strv_length (b))\n'
-                     '    goto out;\n'
-                     '  for (n = 0; a[n] != NULL; n++)\n'
-                     '    if (g_strcmp0 (a[n], b[n]) != 0)\n'
-                     '      goto out;\n'
-                     '  ret = TRUE;\n'
-                     'out:\n'
-                     '  return ret;\n'
-                     '}\n'
-                     '\n')
-
-        self.c.write('static gboolean\n'
-                     '_g_variant_equal0 (GVariant *a, GVariant *b)\n'
-                     '{\n'
-                     '  gboolean ret = FALSE;\n'
-                     '  if (a == NULL && b == NULL)\n'
-                     '    {\n'
-                     '      ret = TRUE;\n'
-                     '      goto out;\n'
-                     '    }\n'
-                     '  if (a == NULL || b == NULL)\n'
-                     '    goto out;\n'
-                     '  ret = g_variant_equal (a, b);\n'
-                     'out:\n'
-                     '  return ret;\n'
-                     '}\n'
-                     '\n')
-
-        # simplified - only supports the types we use
-        self.c.write('G_GNUC_UNUSED static gboolean\n'
-                     '_g_value_equal (const GValue *a, const GValue *b)\n'
-                     '{\n'
-                     '  gboolean ret = FALSE;\n'
-                     '  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));\n'
-                     '  switch (G_VALUE_TYPE (a))\n'
-                     '    {\n'
-                     '      case G_TYPE_BOOLEAN:\n'
-                     '        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_UCHAR:\n'
-                     '        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_INT:\n'
-                     '        ret = (g_value_get_int (a) == g_value_get_int (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_UINT:\n'
-                     '        ret = (g_value_get_uint (a) == g_value_get_uint (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_INT64:\n'
-                     '        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_UINT64:\n'
-                     '        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_DOUBLE:\n'
-                     '        ret = (g_value_get_double (a) == g_value_get_double (b));\n'
-                     '        break;\n'
-                     '      case G_TYPE_STRING:\n'
-                     '        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);\n'
-                     '        break;\n'
-                     '      case G_TYPE_VARIANT:\n'
-                     '        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));\n'
-                     '        break;\n'
-                     '      default:\n'
-                     '        if (G_VALUE_TYPE (a) == G_TYPE_STRV)\n'
-                     '          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));\n'
-                     '        else\n'
-                     '          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));\n'
-                     '        break;\n'
-                     '    }\n'
-                     '  return ret;\n'
-                     '}\n'
-                     '\n')
-
-        self.h.write('/*\n'
-                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
-                     ' *\n'
-                     ' * The license of this code is the same as for the source it was derived from.\n'
-                     ' */\n'
-                     '\n'
-                     '#ifndef __%s__\n'
-                     '#define __%s__\n'
-                     '\n'%(config.VERSION, self.header_guard, self.header_guard))
-        self.h.write('#include <gio/gio.h>\n'
-                     '\n'
-                     'G_BEGIN_DECLS\n'
-                     '\n')
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def declare_types(self):
-        for i in self.ifaces:
-            self.h.write('\n')
-            self.h.write('/* ------------------------------------------------------------------------ */\n')
-            self.h.write('/* Declarations for %s */\n'%i.name)
-            self.h.write('\n')
-
-            # First the GInterface
-            self.h.write('#define %sTYPE_%s (%s_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
-            self.h.write('#define %s%s(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s, %s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %sIS_%s(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-            self.h.write('#define %s%s_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), %sTYPE_%s, %s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('\n')
-            self.h.write('struct _%s;\n'%(i.camel_name))
-            self.h.write('typedef struct _%s %s;\n'%(i.camel_name, i.camel_name))
-            self.h.write('typedef struct _%sIface %sIface;\n'%(i.camel_name, i.camel_name))
-            self.h.write('\n')
-            self.h.write('struct _%sIface\n'%(i.camel_name))
-            self.h.write('{\n')
-            self.h.write('  GTypeInterface parent_iface;\n')
-
-            function_pointers = {}
-
-            if len(i.methods) > 0:
-                self.h.write('\n')
-                for m in i.methods:
-                    key = (m.since, '_method_%s'%m.name_lower)
-                    value  = '  gboolean (*handle_%s) (\n'%(m.name_lower)
-                    value += '    %s *object,\n'%(i.camel_name)
-                    value += '    GDBusMethodInvocation *invocation'%()
-                    for a in m.in_args:
-                        value += ',\n    %s%s'%(a.ctype_in, a.name)
-                    value += ');\n\n'
-                    function_pointers[key] = value
-
-            if len(i.signals) > 0:
-                self.h.write('\n')
-                for s in i.signals:
-                    key = (s.since, '_signal_%s'%s.name_lower)
-                    value  = '  void (*%s) (\n'%(s.name_lower)
-                    value += '    %s *object'%(i.camel_name)
-                    for a in s.args:
-                        value += ',\n    %s%s'%(a.ctype_in, a.name)
-                    value += ');\n\n'
-                    function_pointers[key] = value
-
-            # Sort according to @since tag, then name.. this ensures
-            # that the function pointers don't change order assuming
-            # judicious use of @since
-            #
-            # Also use a proper version comparison function so e.g.
-            # 10.0 comes after 2.0.
-            #
-            # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
-            # for discussion
-            keys = function_pointers.keys()
-            if len(keys) > 0:
-                keys.sort(cmp=utils.my_version_cmp)
-                for key in keys:
-                    self.h.write('%s'%function_pointers[key])
-
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %s_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
-            self.h.write('\n')
-            self.h.write('GDBusInterfaceInfo *%s_interface_info (void);\n'%(i.name_lower))
-            if len(i.properties) > 0:
-                self.h.write('guint %s_override_properties (GObjectClass *klass, guint property_id_begin);\n'%(i.name_lower))
-            self.h.write('\n')
-
-            # Then method call completion functions
-            if len(i.methods) > 0:
-                self.h.write('\n')
-                self.h.write('/* D-Bus method call completion functions: */\n')
-                for m in i.methods:
-                    if m.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('void %s_complete_%s (\n'
-                                 '    %s *object,\n'
-                                 '    GDBusMethodInvocation *invocation'%(i.name_lower, m.name_lower, i.camel_name))
-                    for a in m.out_args:
-                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
-                    self.h.write(');\n')
-                    self.h.write('\n')
-                self.h.write('\n')
-
-            # Then signal emission functions
-            if len(i.signals) > 0:
-                self.h.write('\n')
-                self.h.write('/* D-Bus signal emissions functions: */\n')
-                for s in i.signals:
-                    if s.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('void %s_emit_%s (\n'
-                                 '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
-                    for a in s.args:
-                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
-                    self.h.write(');\n')
-                    self.h.write('\n')
-                self.h.write('\n')
-
-            # Then method call declarations
-            if len(i.methods) > 0:
-                self.h.write('\n')
-                self.h.write('/* D-Bus method calls: */\n')
-                for m in i.methods:
-                    # async begin
-                    if m.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('void %s_call_%s (\n'
-                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-                    for a in m.in_args:
-                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
-                    self.h.write(',\n'
-                                 '    GCancellable *cancellable,\n'
-                                 '    GAsyncReadyCallback callback,\n'
-                                 '    gpointer user_data);\n')
-                    self.h.write('\n')
-                    # async finish
-                    if m.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('gboolean %s_call_%s_finish (\n'
-                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-                    for a in m.out_args:
-                        self.h.write(',\n    %sout_%s'%(a.ctype_out, a.name))
-                    self.h.write(',\n'
-                                 '    GAsyncResult *res,\n'
-                                 '    GError **error);\n')
-                    self.h.write('\n')
-                    # sync
-                    if m.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('gboolean %s_call_%s_sync (\n'
-                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-                    for a in m.in_args:
-                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
-                    for a in m.out_args:
-                        self.h.write(',\n    %sout_%s'%(a.ctype_out, a.name))
-                    self.h.write(',\n'
-                                 '    GCancellable *cancellable,\n'
-                                 '    GError **error);\n')
-                    self.h.write('\n')
-                self.h.write('\n')
-
-            # Then the property accessor declarations
-            if len(i.properties) > 0:
-                self.h.write('\n')
-                self.h.write('/* D-Bus property accessors: */\n')
-                for p in i.properties:
-                    # getter
-                    if p.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('%s%s_get_%s (%s *object);\n'%(p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name))
-                    # setter
-                    if p.deprecated:
-                        self.h.write('G_GNUC_DEPRECATED ')
-                    self.h.write('void %s_set_%s (%s *object, %svalue);\n'%(i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in, ))
-                    self.h.write('\n')
-
-            # Then the proxy
-            self.h.write('\n')
-            self.h.write('/* ---- */\n')
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_%s_PROXY (%s_proxy_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
-            self.h.write('#define %s%s_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s_PROXY, %sProxy))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %s%s_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_%s_PROXY, %sProxyClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %s%s_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_%s_PROXY, %sProxyClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %sIS_%s_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s_PROXY))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-            self.h.write('#define %sIS_%s_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_%s_PROXY))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-            self.h.write('\n')
-            self.h.write('typedef struct _%sProxy %sProxy;\n'%(i.camel_name, i.camel_name))
-            self.h.write('typedef struct _%sProxyClass %sProxyClass;\n'%(i.camel_name, i.camel_name))
-            self.h.write('typedef struct _%sProxyPrivate %sProxyPrivate;\n'%(i.camel_name, i.camel_name))
-            self.h.write('\n')
-            self.h.write('struct _%sProxy\n'%(i.camel_name))
-            self.h.write('{\n')
-            self.h.write('  /*< private >*/\n')
-            self.h.write('  GDBusProxy parent_instance;\n')
-            self.h.write('  %sProxyPrivate *priv;\n'%(i.camel_name))
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('struct _%sProxyClass\n'%(i.camel_name))
-            self.h.write('{\n')
-            self.h.write('  GDBusProxyClass parent_class;\n')
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %s_proxy_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
-
-            self.h.write('\n')
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('void %s_proxy_new (\n'
-                         '    GDBusConnection     *connection,\n'
-                         '    GDBusProxyFlags      flags,\n'
-                         '    const gchar         *name,\n'
-                         '    const gchar         *object_path,\n'
-                         '    GCancellable        *cancellable,\n'
-                         '    GAsyncReadyCallback  callback,\n'
-                         '    gpointer             user_data);\n'
-                         %(i.name_lower))
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('%s *%s_proxy_new_finish (\n'
-                         '    GAsyncResult        *res,\n'
-                         '    GError             **error);\n'
-                         %(i.camel_name, i.name_lower))
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('%s *%s_proxy_new_sync (\n'
-                         '    GDBusConnection     *connection,\n'
-                         '    GDBusProxyFlags      flags,\n'
-                         '    const gchar         *name,\n'
-                         '    const gchar         *object_path,\n'
-                         '    GCancellable        *cancellable,\n'
-                         '    GError             **error);\n'
-                         %(i.camel_name, i.name_lower))
-            self.h.write('\n')
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('void %s_proxy_new_for_bus (\n'
-                         '    GBusType             bus_type,\n'
-                         '    GDBusProxyFlags      flags,\n'
-                         '    const gchar         *name,\n'
-                         '    const gchar         *object_path,\n'
-                         '    GCancellable        *cancellable,\n'
-                         '    GAsyncReadyCallback  callback,\n'
-                         '    gpointer             user_data);\n'
-                         %(i.name_lower))
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('%s *%s_proxy_new_for_bus_finish (\n'
-                         '    GAsyncResult        *res,\n'
-                         '    GError             **error);\n'
-                         %(i.camel_name, i.name_lower))
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('%s *%s_proxy_new_for_bus_sync (\n'
-                         '    GBusType             bus_type,\n'
-                         '    GDBusProxyFlags      flags,\n'
-                         '    const gchar         *name,\n'
-                         '    const gchar         *object_path,\n'
-                         '    GCancellable        *cancellable,\n'
-                         '    GError             **error);\n'
-                         %(i.camel_name, i.name_lower))
-            self.h.write('\n')
-
-            # Then the skeleton
-            self.h.write('\n')
-            self.h.write('/* ---- */\n')
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_%s_SKELETON (%s_skeleton_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
-            self.h.write('#define %s%s_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s_SKELETON, %sSkeleton))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %s%s_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_%s_SKELETON, %sSkeletonClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %s%s_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_%s_SKELETON, %sSkeletonClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
-            self.h.write('#define %sIS_%s_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s_SKELETON))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-            self.h.write('#define %sIS_%s_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_%s_SKELETON))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-            self.h.write('\n')
-            self.h.write('typedef struct _%sSkeleton %sSkeleton;\n'%(i.camel_name, i.camel_name))
-            self.h.write('typedef struct _%sSkeletonClass %sSkeletonClass;\n'%(i.camel_name, i.camel_name))
-            self.h.write('typedef struct _%sSkeletonPrivate %sSkeletonPrivate;\n'%(i.camel_name, i.camel_name))
-            self.h.write('\n')
-            self.h.write('struct _%sSkeleton\n'%(i.camel_name))
-            self.h.write('{\n')
-            self.h.write('  /*< private >*/\n')
-            self.h.write('  GDBusInterfaceSkeleton parent_instance;\n')
-            self.h.write('  %sSkeletonPrivate *priv;\n'%(i.camel_name))
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('struct _%sSkeletonClass\n'%(i.camel_name))
-            self.h.write('{\n')
-            self.h.write('  GDBusInterfaceSkeletonClass parent_class;\n')
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %s_skeleton_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
-            self.h.write('\n')
-            if i.deprecated:
-                self.h.write('G_GNUC_DEPRECATED ')
-            self.h.write('%s *%s_skeleton_new (void);\n'%(i.camel_name, i.name_lower))
-
-            self.h.write('\n')
-
-        # Finally, the Object, ObjectProxy, ObjectSkeleton and ObjectManagerClient
-        if self.generate_objmanager:
-            self.h.write('\n')
-            self.h.write('/* ---- */\n')
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_OBJECT (%sobject_get_type ())\n'%(self.ns_upper, self.ns_lower))
-            self.h.write('#define %sOBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT, %sObject))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sIS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('#define %sOBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), %sTYPE_OBJECT, %sObject))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('\n')
-            self.h.write('struct _%sObject;\n'%(self.namespace))
-            self.h.write('typedef struct _%sObject %sObject;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectIface %sObjectIface;\n'%(self.namespace, self.namespace))
-            self.h.write('\n')
-            self.h.write('struct _%sObjectIface\n'%(self.namespace))
-            self.h.write('{\n'
-                         '  GTypeInterface parent_iface;\n'
-                         '};\n'
-                         '\n')
-            self.h.write('GType %sobject_get_type (void) G_GNUC_CONST;\n'
-                         '\n'
-                         %(self.ns_lower))
-            for i in self.ifaces:
-                if i.deprecated:
-                    self.h.write('G_GNUC_DEPRECATED ')
-                self.h.write ('%s *%sobject_get_%s (%sObject *object);\n'
-                              %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
-            for i in self.ifaces:
-                if i.deprecated:
-                    self.h.write('G_GNUC_DEPRECATED ')
-                self.h.write ('%s *%sobject_peek_%s (%sObject *object);\n'
-                              %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_OBJECT_PROXY (%sobject_proxy_get_type ())\n'%(self.ns_upper, self.ns_lower))
-            self.h.write('#define %sOBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_PROXY, %sObjectProxy))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_PROXY, %sObjectProxyClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_PROXY, %sObjectProxyClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sIS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_PROXY))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('#define %sIS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_PROXY))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('\n')
-            self.h.write('typedef struct _%sObjectProxy %sObjectProxy;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectProxyClass %sObjectProxyClass;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectProxyPrivate %sObjectProxyPrivate;\n'%(self.namespace, self.namespace))
-            self.h.write('\n')
-            self.h.write('struct _%sObjectProxy\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  /*< private >*/\n')
-            self.h.write('  GDBusObjectProxy parent_instance;\n')
-            self.h.write('  %sObjectProxyPrivate *priv;\n'%(self.namespace))
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('struct _%sObjectProxyClass\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  GDBusObjectProxyClass parent_class;\n')
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %sobject_proxy_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
-            self.h.write('%sObjectProxy *%sobject_proxy_new (GDBusConnection *connection, const gchar *object_path);\n'%(self.namespace, self.ns_lower))
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_OBJECT_SKELETON (%sobject_skeleton_get_type ())\n'%(self.ns_upper, self.ns_lower))
-            self.h.write('#define %sOBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_SKELETON, %sObjectSkeleton))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_SKELETON, %sObjectSkeletonClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_SKELETON, %sObjectSkeletonClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sIS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_SKELETON))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('#define %sIS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_SKELETON))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('\n')
-            self.h.write('typedef struct _%sObjectSkeleton %sObjectSkeleton;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectSkeletonClass %sObjectSkeletonClass;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectSkeletonPrivate %sObjectSkeletonPrivate;\n'%(self.namespace, self.namespace))
-            self.h.write('\n')
-            self.h.write('struct _%sObjectSkeleton\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  /*< private >*/\n')
-            self.h.write('  GDBusObjectSkeleton parent_instance;\n')
-            self.h.write('  %sObjectSkeletonPrivate *priv;\n'%(self.namespace))
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('struct _%sObjectSkeletonClass\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  GDBusObjectSkeletonClass parent_class;\n')
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %sobject_skeleton_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
-            self.h.write('%sObjectSkeleton *%sobject_skeleton_new (const gchar *object_path);\n'
-                         %(self.namespace, self.ns_lower))
-            for i in self.ifaces:
-                if i.deprecated:
-                    self.h.write('G_GNUC_DEPRECATED ')
-                self.h.write ('void %sobject_skeleton_set_%s (%sObjectSkeleton *object, %s *interface_);\n'
-                              %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name))
-            self.h.write('\n')
-
-            self.h.write('/* ---- */\n')
-            self.h.write('\n')
-            self.h.write('#define %sTYPE_OBJECT_MANAGER_CLIENT (%sobject_manager_client_get_type ())\n'%(self.ns_upper, self.ns_lower))
-            self.h.write('#define %sOBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClient))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClientClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sOBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClientClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
-            self.h.write('#define %sIS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_MANAGER_CLIENT))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('#define %sIS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_MANAGER_CLIENT))\n'%(self.ns_upper, self.ns_upper))
-            self.h.write('\n')
-            self.h.write('typedef struct _%sObjectManagerClient %sObjectManagerClient;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectManagerClientClass %sObjectManagerClientClass;\n'%(self.namespace, self.namespace))
-            self.h.write('typedef struct _%sObjectManagerClientPrivate %sObjectManagerClientPrivate;\n'%(self.namespace, self.namespace))
-            self.h.write('\n')
-            self.h.write('struct _%sObjectManagerClient\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  /*< private >*/\n')
-            self.h.write('  GDBusObjectManagerClient parent_instance;\n')
-            self.h.write('  %sObjectManagerClientPrivate *priv;\n'%(self.namespace))
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('struct _%sObjectManagerClientClass\n'%(self.namespace))
-            self.h.write('{\n')
-            self.h.write('  GDBusObjectManagerClientClass parent_class;\n')
-            self.h.write('};\n')
-            self.h.write('\n')
-            self.h.write('GType %sobject_manager_client_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
-            self.h.write('\n')
-            self.h.write('GType %sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);\n'%(self.ns_lower))
-            self.h.write('\n')
-            self.h.write('void %sobject_manager_client_new (\n'
-                         '    GDBusConnection        *connection,\n'
-                         '    GDBusObjectManagerClientFlags  flags,\n'
-                         '    const gchar            *name,\n'
-                         '    const gchar            *object_path,\n'
-                         '    GCancellable           *cancellable,\n'
-                         '    GAsyncReadyCallback     callback,\n'
-                         '    gpointer                user_data);\n'
-                         %(self.ns_lower))
-            self.h.write('GDBusObjectManager *%sobject_manager_client_new_finish (\n'
-                         '    GAsyncResult        *res,\n'
-                         '    GError             **error);\n'
-                         %(self.ns_lower))
-            self.h.write('GDBusObjectManager *%sobject_manager_client_new_sync (\n'
-                         '    GDBusConnection        *connection,\n'
-                         '    GDBusObjectManagerClientFlags  flags,\n'
-                         '    const gchar            *name,\n'
-                         '    const gchar            *object_path,\n'
-                         '    GCancellable           *cancellable,\n'
-                         '    GError                **error);\n'
-                         %(self.ns_lower))
-            self.h.write('\n')
-            self.h.write('void %sobject_manager_client_new_for_bus (\n'
-                         '    GBusType                bus_type,\n'
-                         '    GDBusObjectManagerClientFlags  flags,\n'
-                         '    const gchar            *name,\n'
-                         '    const gchar            *object_path,\n'
-                         '    GCancellable           *cancellable,\n'
-                         '    GAsyncReadyCallback     callback,\n'
-                         '    gpointer                user_data);\n'
-                         %(self.ns_lower))
-            self.h.write('GDBusObjectManager *%sobject_manager_client_new_for_bus_finish (\n'
-                         '    GAsyncResult        *res,\n'
-                         '    GError             **error);\n'
-                         %(self.ns_lower))
-            self.h.write('GDBusObjectManager *%sobject_manager_client_new_for_bus_sync (\n'
-                         '    GBusType                bus_type,\n'
-                         '    GDBusObjectManagerClientFlags  flags,\n'
-                         '    const gchar            *name,\n'
-                         '    const gchar            *object_path,\n'
-                         '    GCancellable           *cancellable,\n'
-                         '    GError                **error);\n'
-                         %(self.ns_lower))
-            self.h.write('\n')
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def generate_outro(self):
-        self.h.write('\n'
-                     'G_END_DECLS\n'
-                     '\n'
-                     '#endif /* __%s__ */\n'%(self.header_guard))
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def generate_annotations(self, prefix, annotations):
-        if annotations == None:
-            return
-
-        n = 0
-        for a in annotations:
-            #self.generate_annotations('%s_%d'%(prefix, n), a.get_annotations())
-
-            # skip internal annotations
-            if a.key.startswith('org.gtk.GDBus'):
-                continue
-
-            self.c.write('static const GDBusAnnotationInfo %s_%d =\n'
-                         '{\n'
-                         '  -1,\n'
-                         '  "%s",\n'
-                         '  "%s",\n'%(prefix, n, a.key, a.value))
-            if len(a.annotations) == 0:
-                self.c.write('  NULL\n')
-            else:
-                self.c.write('  (GDBusAnnotationInfo **) &%s_%d_pointers\n'%(prefix, n))
-            self.c.write('};\n'
-                         '\n')
-            n += 1
-
-        if n > 0:
-            self.c.write('static const GDBusAnnotationInfo * const %s_pointers[] =\n'
-                             '{\n'%(prefix))
-            m = 0;
-            for a in annotations:
-                if a.key.startswith('org.gtk.GDBus'):
-                    continue
-                self.c.write('  &%s_%d,\n'%(prefix, m))
-                m += 1
-            self.c.write('  NULL\n'
-                         '};\n'
-                         '\n')
-        return n
-
-    def generate_args(self, prefix, args):
-        for a in args:
-            num_anno = self.generate_annotations('%s_arg_%s_annotation_info'%(prefix, a.name), a.annotations)
-
-            self.c.write('static const _ExtendedGDBusArgInfo %s_%s =\n'
-                         '{\n'
-                         '  {\n'
-                         '    -1,\n'
-                         '    "%s",\n'
-                         '    "%s",\n'%(prefix, a.name, a.name, a.signature))
-            if num_anno == 0:
-                self.c.write('    NULL\n')
-            else:
-                self.c.write('    (GDBusAnnotationInfo **) &%s_arg_%s_annotation_info_pointers\n'%(prefix, a.name))
-            self.c.write('  },\n')
-            if not utils.lookup_annotation(a.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
-                self.c.write('  FALSE\n')
-            else:
-                self.c.write('  TRUE\n')
-            self.c.write('};\n'
-                         '\n')
-
-        if len(args) > 0:
-            self.c.write('static const _ExtendedGDBusArgInfo * const %s_pointers[] =\n'
-                             '{\n'%(prefix))
-            for a in args:
-                self.c.write('  &%s_%s,\n'%(prefix, a.name))
-            self.c.write('  NULL\n'
-                         '};\n'
-                         '\n')
-
-    def generate_introspection_for_interface(self, i):
-            self.c.write('/* ---- Introspection data for %s ---- */\n'
-                         '\n'%(i.name))
-
-            if len(i.methods) > 0:
-                for m in i.methods:
-                    self.generate_args('_%s_method_info_%s_IN_ARG'%(i.name_lower, m.name_lower), m.in_args)
-                    self.generate_args('_%s_method_info_%s_OUT_ARG'%(i.name_lower, m.name_lower), m.out_args)
-
-                    num_anno = self.generate_annotations('_%s_method_%s_annotation_info'%(i.name_lower, m.name_lower), m.annotations)
-
-                    self.c.write('static const _ExtendedGDBusMethodInfo _%s_method_info_%s =\n'
-                                 '{\n'
-                                 '  {\n'
-                                 '    -1,\n'
-                                 '    "%s",\n'%(i.name_lower, m.name_lower, m.name))
-                    if len(m.in_args) == 0:
-                        self.c.write('    NULL,\n')
-                    else:
-                        self.c.write('    (GDBusArgInfo **) &_%s_method_info_%s_IN_ARG_pointers,\n'%(i.name_lower, m.name_lower))
-                    if len(m.out_args) == 0:
-                        self.c.write('    NULL,\n')
-                    else:
-                        self.c.write('    (GDBusArgInfo **) &_%s_method_info_%s_OUT_ARG_pointers,\n'%(i.name_lower, m.name_lower))
-                    if num_anno == 0:
-                        self.c.write('    NULL\n')
-                    else:
-                        self.c.write('    (GDBusAnnotationInfo **) &_%s_method_%s_annotation_info_pointers\n'%(i.name_lower, m.name_lower))
-                    self.c.write('  },\n'
-                                 '  "handle-%s"\n'
-                                 %(m.name_hyphen))
-                    self.c.write('};\n'
-                                 '\n')
-
-                self.c.write('static const _ExtendedGDBusMethodInfo * const _%s_method_info_pointers[] =\n'
-                             '{\n'%(i.name_lower))
-                for m in i.methods:
-                    self.c.write('  &_%s_method_info_%s,\n'%(i.name_lower, m.name_lower))
-                self.c.write('  NULL\n'
-                             '};\n'
-                             '\n')
-
-            # ---
-
-            if len(i.signals) > 0:
-                for s in i.signals:
-                    self.generate_args('_%s_signal_info_%s_ARG'%(i.name_lower, s.name_lower), s.args)
-
-                    num_anno = self.generate_annotations('_%s_signal_%s_annotation_info'%(i.name_lower, s.name_lower), s.annotations)
-                    self.c.write('static const _ExtendedGDBusSignalInfo _%s_signal_info_%s =\n'
-                                 '{\n'
-                                 '  {\n'
-                                 '    -1,\n'
-                                 '    "%s",\n'%(i.name_lower, s.name_lower, s.name))
-                    if len(s.args) == 0:
-                        self.c.write('    NULL,\n')
-                    else:
-                        self.c.write('    (GDBusArgInfo **) &_%s_signal_info_%s_ARG_pointers,\n'%(i.name_lower, s.name_lower))
-                    if num_anno == 0:
-                        self.c.write('    NULL\n')
-                    else:
-                        self.c.write('    (GDBusAnnotationInfo **) &_%s_signal_%s_annotation_info_pointers\n'%(i.name_lower, s.name_lower))
-                    self.c.write('  },\n'
-                                 '  "%s"\n'
-                                 %(s.name_hyphen))
-                    self.c.write('};\n'
-                                 '\n')
-
-                self.c.write('static const _ExtendedGDBusSignalInfo * const _%s_signal_info_pointers[] =\n'
-                             '{\n'%(i.name_lower))
-                for s in i.signals:
-                    self.c.write('  &_%s_signal_info_%s,\n'%(i.name_lower, s.name_lower))
-                self.c.write('  NULL\n'
-                             '};\n'
-                             '\n')
-
-            # ---
-
-            if len(i.properties) > 0:
-                for p in i.properties:
-                    if p.readable and p.writable:
-                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
-                    elif p.readable:
-                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE'
-                    elif p.writable:
-                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
-                    else:
-                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_NONE'
-                    num_anno = self.generate_annotations('_%s_property_%s_annotation_info'%(i.name_lower, p.name_lower), p.annotations)
-                    self.c.write('static const _ExtendedGDBusPropertyInfo _%s_property_info_%s =\n'
-                                 '{\n'
-                                 '  {\n'
-                                 '    -1,\n'
-                                 '    "%s",\n'
-                                 '    "%s",\n'
-                                 '    %s,\n'%(i.name_lower, p.name_lower, p.name, p.arg.signature, access))
-                    if num_anno == 0:
-                        self.c.write('    NULL\n')
-                    else:
-                        self.c.write('    (GDBusAnnotationInfo **) &_%s_property_%s_annotation_info_pointers\n'%(i.name_lower, p.name_lower))
-                    self.c.write('  },\n'
-                                 '  "%s",\n'
-                                 %(p.name_hyphen))
-                    if not utils.lookup_annotation(p.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
-                        self.c.write('  FALSE\n')
-                    else:
-                        self.c.write('  TRUE\n')
-                    self.c.write('};\n'
-                                 '\n')
-
-                self.c.write('static const _ExtendedGDBusPropertyInfo * const _%s_property_info_pointers[] =\n'
-                             '{\n'%(i.name_lower))
-                for p in i.properties:
-                    self.c.write('  &_%s_property_info_%s,\n'%(i.name_lower, p.name_lower))
-                self.c.write('  NULL\n'
-                             '};\n'
-                             '\n')
-
-            num_anno = self.generate_annotations('_%s_annotation_info'%(i.name_lower), i.annotations)
-            self.c.write('static const _ExtendedGDBusInterfaceInfo _%s_interface_info =\n'
-                         '{\n'
-                         '  {\n'
-                         '    -1,\n'
-                         '    "%s",\n'%(i.name_lower, i.name))
-            if len(i.methods) == 0:
-                self.c.write('    NULL,\n')
-            else:
-                self.c.write('    (GDBusMethodInfo **) &_%s_method_info_pointers,\n'%(i.name_lower))
-            if len(i.signals) == 0:
-                self.c.write('    NULL,\n')
-            else:
-                self.c.write('    (GDBusSignalInfo **) &_%s_signal_info_pointers,\n'%(i.name_lower))
-            if len(i.properties) == 0:
-                self.c.write('    NULL,\n')
-            else:
-                self.c.write('    (GDBusPropertyInfo **) &_%s_property_info_pointers,\n'%(i.name_lower))
-            if num_anno == 0:
-                self.c.write('    NULL\n')
-            else:
-                self.c.write('    (GDBusAnnotationInfo **) &_%s_annotation_info_pointers\n'%(i.name_lower))
-            self.c.write('  },\n'
-                         '  "%s",\n'
-                         '};\n'
-                         '\n'
-                         %(i.name_hyphen))
-            self.c.write('\n')
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %s_interface_info:\n'
-                    ' *\n'
-                    ' * Gets a machine-readable description of the #%s D-Bus interface.\n'
-                    ' *\n'
-                    ' * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.\n'
-                    %(i.name_lower, i.name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-            self.c.write('GDBusInterfaceInfo *\n'
-                         '%s_interface_info (void)\n'
-                         '{\n'
-                         '  return (GDBusInterfaceInfo *) &_%s_interface_info;\n'
-                         '}\n'
-                         '\n'%(i.name_lower, i.name_lower))
-
-            if len(i.properties) > 0:
-                self.c.write(self.docbook_gen.expand(
-                        '/**\n'
-                        ' * %s_override_properties:\n'
-                        ' * @klass: The class structure for a #GObject<!-- -->-derived class.\n'
-                        ' * @property_id_begin: The property id to assign to the first overridden property.\n'
-                        ' *\n'
-                        ' * Overrides all #GObject properties in the #%s interface for a concrete class.\n'
-                        ' * The properties are overridden in the order they are defined.\n'
-                        ' *\n'
-                        ' * Returns: The last property id.\n'
-                        %(i.name_lower, i.camel_name), False))
-                self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-                self.c.write('guint\n'
-                             '%s_override_properties (GObjectClass *klass, guint property_id_begin)\n'
-                             '{\n'%(i.name_lower))
-                for p in i.properties:
-                    self.c.write ('  g_object_class_override_property (klass, property_id_begin++, "%s");\n'%(p.name_hyphen))
-                self.c.write('  return property_id_begin - 1;\n'
-                             '}\n'
-                             '\n')
-            self.c.write('\n')
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def generate_interface(self, i):
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s:\n'
-                ' *\n'
-                ' * Abstract interface type for the D-Bus interface #%s.\n'
-                %(i.camel_name, i.name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sIface:\n'
-                ' * @parent_iface: The parent interface.\n'
-                %(i.camel_name), False))
-
-        doc_bits = {}
-        if len(i.methods) > 0:
-            for m in i.methods:
-                key = (m.since, '_method_%s'%m.name_lower)
-                value  = '@handle_%s: '%(m.name_lower)
-                value += 'Handler for the #%s::handle-%s signal.'%(i.camel_name, m.name_hyphen)
-                doc_bits[key] = value
-        if len(i.signals) > 0:
-            for s in i.signals:
-                key = (s.since, '_signal_%s'%s.name_lower)
-                value  = '@%s: '%(s.name_lower)
-                value += 'Handler for the #%s::%s signal.'%(i.camel_name, s.name_hyphen)
-                doc_bits[key] = value
-        keys = doc_bits.keys()
-        if len(keys) > 0:
-            keys.sort(cmp=utils.my_version_cmp)
-            for key in keys:
-                self.c.write(' * %s\n'%doc_bits[key])
-        self.c.write(self.docbook_gen.expand(
-                ' *\n'
-                ' * Virtual table for the D-Bus interface #%s.\n'
-                %(i.name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write('static void\n'
-                     '%s_default_init (%sIface *iface)\n'
-                     '{\n'%(i.name_lower, i.camel_name));
-
-        if len(i.methods) > 0:
-            self.c.write('  /* GObject signals for incoming D-Bus method calls: */\n')
-            for m in i.methods:
-                self.c.write(self.docbook_gen.expand(
-                        '  /**\n'
-                        '   * %s::handle-%s:\n'
-                        '   * @object: A #%s.\n'
-                        '   * @invocation: A #GDBusMethodInvocation.\n'
-                        %(i.camel_name, m.name_hyphen, i.camel_name), False))
-                for a in m.in_args:
-                    self.c.write ('   * @%s: Argument passed by remote caller.\n'%(a.name))
-                self.c.write(self.docbook_gen.expand(
-                        '   *\n'
-                        '   * Signal emitted when a remote caller is invoking the %s.%s() D-Bus method.\n'
-                        '   *\n'
-                        '   * If a signal handler returns %%TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call %s_complete_%s() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %%G_DBUS_ERROR_UNKNOWN_METHOD error is returned.\n'
-                        '   *\n'
-                        '   * Returns: %%TRUE if the invocation was handled, %%FALSE to let other signal handlers run.\n'
-                        %(i.name, m.name, i.name_lower, m.name_lower), False))
-                self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 2)
-                self.c.write('  g_signal_new ("handle-%s",\n'
-                             '    G_TYPE_FROM_INTERFACE (iface),\n'
-                             '    G_SIGNAL_RUN_LAST,\n'
-                             '    G_STRUCT_OFFSET (%sIface, handle_%s),\n'
-                             '    g_signal_accumulator_true_handled,\n'
-                             '    NULL,\n' # accu_data
-                             '    g_cclosure_marshal_generic,\n'
-                             '    G_TYPE_BOOLEAN,\n'
-                             '    %d,\n'
-                             '    G_TYPE_DBUS_METHOD_INVOCATION'
-                             %(m.name_hyphen, i.camel_name, m.name_lower, len(m.in_args) + 1))
-                for a in m.in_args:
-                    self.c.write (', %s'%(a.gtype))
-                self.c.write(');\n')
-                self.c.write('\n')
-
-        if len(i.signals) > 0:
-            self.c.write('  /* GObject signals for received D-Bus signals: */\n')
-            for s in i.signals:
-                self.c.write(self.docbook_gen.expand(
-                        '  /**\n'
-                        '   * %s::%s:\n'
-                        '   * @object: A #%s.\n'
-                        %(i.camel_name, s.name_hyphen, i.camel_name), False))
-                for a in s.args:
-                    self.c.write ('   * @%s: Argument.\n'%(a.name))
-                self.c.write(self.docbook_gen.expand(
-                        '   *\n'
-                        '   * On the client-side, this signal is emitted whenever the D-Bus signal #%s::%s is received.\n'
-                        '   *\n'
-                        '   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.\n'
-                        %(i.name, s.name), False))
-                self.write_gtkdoc_deprecated_and_since_and_close(s, self.c, 2)
-                self.c.write('  g_signal_new ("%s",\n'
-                             '    G_TYPE_FROM_INTERFACE (iface),\n'
-                             '    G_SIGNAL_RUN_LAST,\n'
-                             '    G_STRUCT_OFFSET (%sIface, %s),\n'
-                             '    NULL,\n' # accumulator
-                             '    NULL,\n' # accu_data
-                             '    g_cclosure_marshal_generic,\n'
-                             '    G_TYPE_NONE,\n'
-                             '    %d'
-                             %(s.name_hyphen, i.camel_name, s.name_lower, len(s.args)))
-                for a in s.args:
-                    self.c.write (', %s'%(a.gtype))
-                self.c.write(');\n')
-                self.c.write('\n')
-
-        if len(i.properties) > 0:
-            self.c.write('  /* GObject properties for D-Bus properties: */\n')
-            for p in i.properties:
-                if p.readable and p.writable:
-                    hint = 'Since the D-Bus property for this #GObject property is both readable and writable, it is meaningful to both read from it and write to it on both the service- and client-side.'
-                elif p.readable:
-                    hint = 'Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.'
-                elif p.writable:
-                    hint = 'Since the D-Bus property for this #GObject property is writable but not readable, it is meaningful to write to it on both the client- and service-side. It is only meaningful, however, to read from it on the service-side.'
-                else:
-                    raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
-                self.c.write(self.docbook_gen.expand(
-                        '  /**\n'
-                        '   * %s:%s:\n'
-                        '   *\n'
-                        '   * Represents the D-Bus property #%s:%s.\n'
-                        '   *\n'
-                        '   * %s\n'
-                        %(i.camel_name, p.name_hyphen, i.name, p.name, hint), False))
-                self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 2)
-                self.c.write('  g_object_interface_install_property (iface,\n')
-                if p.arg.gtype == 'G_TYPE_VARIANT':
-                    s = 'g_param_spec_variant ("%s", "%s", "%s", G_VARIANT_TYPE ("%s"), NULL'%(p.name_hyphen, p.name, p.name, p.arg.signature)
-                elif p.arg.signature == 'b':
-                    s = 'g_param_spec_boolean ("%s", "%s", "%s", FALSE'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'y':
-                    s = 'g_param_spec_uchar ("%s", "%s", "%s", 0, 255, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'n':
-                    s = 'g_param_spec_int ("%s", "%s", "%s", G_MININT16, G_MAXINT16, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'q':
-                    s = 'g_param_spec_uint ("%s", "%s", "%s", 0, G_MAXUINT16, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'i':
-                    s = 'g_param_spec_int ("%s", "%s", "%s", G_MININT32, G_MAXINT32, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'u':
-                    s = 'g_param_spec_uint ("%s", "%s", "%s", 0, G_MAXUINT32, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'x':
-                    s = 'g_param_spec_int64 ("%s", "%s", "%s", G_MININT64, G_MAXINT64, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 't':
-                    s = 'g_param_spec_uint64 ("%s", "%s", "%s", 0, G_MAXUINT64, 0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'd':
-                    s = 'g_param_spec_double ("%s", "%s", "%s", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 's':
-                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'o':
-                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'g':
-                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'ay':
-                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'as':
-                    s = 'g_param_spec_boxed ("%s", "%s", "%s", G_TYPE_STRV'%(p.name_hyphen, p.name, p.name)
-                elif p.arg.signature == 'aay':
-                    s = 'g_param_spec_boxed ("%s", "%s", "%s", G_TYPE_STRV'%(p.name_hyphen, p.name, p.name)
-                else:
-                    raise RuntimeError('Unsupported gtype %s for GParamSpec'%(p.arg.gtype))
-                self.c.write('    %s, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));'%s);
-                self.c.write('\n')
-
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write('typedef %sIface %sInterface;\n'%(i.camel_name, i.camel_name))
-        self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT);\n'%(i.camel_name, i.name_lower))
-        self.c.write('\n')
-
-    # ----------------------------------------------------------------------------------------------------
-
-    def generate_property_accessors(self, i):
-        for p in i.properties:
-            # getter
-            if p.readable and p.writable:
-                hint = 'Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.'
-            elif p.readable:
-                hint = 'Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.'
-            elif p.writable:
-                hint = 'Since this D-Bus property is not readable, it is only meaningful to use this function on the service-side.'
-            else:
-                raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %s_get_%s:\n'
-                    ' * @object: A #%s.\n'
-                    ' *\n'
-                    ' * Gets the value of the #%s:%s D-Bus property.\n'
-                    ' *\n'
-                    ' * %s\n'
-                    ' *\n'
-                    ' * Returns: (transfer none): The property value.\n'
-                    %(i.name_lower, p.name_lower, i.camel_name, i.name, p.name, hint), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 0)
-            self.c.write('%s\n'
-                         '%s_get_%s (%s *object)\n'
-                         '{\n'
-                         '  %svalue;\n'%(p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in_g))
-            self.c.write('  g_object_get (G_OBJECT (object), "%s", &value, NULL);\n'%(p.name_hyphen))
-            if p.arg.free_func:
-                self.c.write('  if (value != NULL)\n'
-                             '    g_object_set_data_full (G_OBJECT (object), "-x-memoizing-%s", (gpointer) value, (GDestroyNotify) %s);\n'
-                             '  else\n'
-                             '    g_object_set_data_full (G_OBJECT (object), "-x-memoizing-%s", (gpointer) value, NULL);\n'
-                             %(p.name_hyphen, p.arg.free_func, p.name_hyphen))
-            self.c.write('  return value;\n')
-            self.c.write('}\n')
-            self.c.write('\n')
-            # setter
-            if p.readable and p.writable:
-                hint = 'Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.'
-            elif p.readable:
-                hint = 'Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.'
-            elif p.writable:
-                hint = 'Since this D-Bus property is writable, it is meaningful to use this function on both the client- and service-side.'
-            else:
-                raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %s_set_%s:\n'
-                    ' * @object: A #%s.\n'
-                    ' * @value: The value to set.\n'
-                    ' *\n'
-                    ' * Sets the #%s:%s D-Bus property to @value.\n'
-                    ' *\n'
-                    ' * %s\n'
-                    %(i.name_lower, p.name_lower, i.camel_name, i.name, p.name, hint), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 0)
-            self.c.write('void\n'
-                         '%s_set_%s (%s *object, %svalue)\n'
-                         '{\n'%(i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in, ))
-            self.c.write('  g_object_set (G_OBJECT (object), "%s", value, NULL);\n'%(p.name_hyphen))
-            self.c.write('}\n')
-            self.c.write('\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_signal_emitters(self, i):
-        for s in i.signals:
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %s_emit_%s:\n'
-                    ' * @object: A #%s.\n'
-                    %(i.name_lower, s.name_lower, i.camel_name), False))
-            for a in s.args:
-                self.c.write(' * @%s: Argument to pass with the signal.\n'%(a.name))
-            self.c.write(self.docbook_gen.expand(
-                    ' *\n'
-                    ' * Emits the #%s::%s D-Bus signal.\n'
-                    %(i.name, s.name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(s, self.c, 0)
-            self.c.write('void\n'
-                         '%s_emit_%s (\n'
-                         '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
-            for a in s.args:
-                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
-            self.c.write(')\n'
-                         '{\n'
-                         '  g_signal_emit_by_name (object, "%s"'%(s.name_hyphen))
-            for a in s.args:
-                self.c.write(', %s'%a.name)
-            self.c.write(');\n')
-            self.c.write('}\n'
-                         '\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_method_calls(self, i):
-        for m in i.methods:
-            # async begin
-            self.c.write('/**\n'
-                         ' * %s_call_%s:\n'
-                         ' * @proxy: A #%sProxy.\n'
-                         %(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.in_args:
-                self.c.write(' * @%s: Argument to pass with the method invocation.\n'%(a.name))
-            self.c.write(self.docbook_gen.expand(
-                    ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                    ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %%NULL.\n'
-                    ' * @user_data: User data to pass to @callback.\n'
-                    ' *\n'
-                    ' * Asynchronously invokes the %s.%s() D-Bus method on @proxy.\n'
-                    ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
-                    ' * You can then call %s_call_%s_finish() to get the result of the operation.\n'
-                    ' *\n'
-                    ' * See %s_call_%s_sync() for the synchronous, blocking version of this method.\n'
-                    %(i.name, m.name, i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
-            self.c.write('void\n'
-                         '%s_call_%s (\n'
-                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.in_args:
-                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
-            self.c.write(',\n'
-                         '    GCancellable *cancellable,\n'
-                         '    GAsyncReadyCallback callback,\n'
-                         '    gpointer user_data)\n'
-                         '{\n')
-            self.c.write('  g_dbus_proxy_call (G_DBUS_PROXY (proxy),\n'
-                         '    "%s",\n'
-                         '    g_variant_new ("('%(m.name))
-            for a in m.in_args:
-                self.c.write('%s'%(a.format_in))
-            self.c.write(')"')
-            for a in m.in_args:
-                self.c.write(',\n                   %s'%(a.name))
-            self.c.write('),\n'
-                         '    G_DBUS_CALL_FLAGS_NONE,\n'
-                         '    -1,\n'
-                         '    cancellable,\n'
-                         '    callback,\n'
-                         '    user_data);\n')
-            self.c.write('}\n'
-                         '\n')
-            # async finish
-            self.c.write('/**\n'
-                         ' * %s_call_%s_finish:\n'
-                         ' * @proxy: A #%sProxy.\n'
-                         %(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.out_args:
-                self.c.write(' * @out_%s: (out): Return location for return parameter or %%NULL to ignore.\n'%(a.name))
-            self.c.write(self.docbook_gen.expand(
-                    ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_call_%s().\n'
-                    ' * @error: Return location for error or %%NULL.\n'
-                    ' *\n'
-                    ' * Finishes an operation started with %s_call_%s().\n'
-                    ' *\n'
-                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
-                    %(i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
-            self.c.write('gboolean\n'
-                         '%s_call_%s_finish (\n'
-                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.out_args:
-                self.c.write(',\n    %sout_%s'%(a.ctype_out, a.name))
-            self.c.write(',\n'
-                         '    GAsyncResult *res,\n'
-                         '    GError **error)\n'
-                         '{\n'
-                         '  GVariant *_ret;\n'
-                         '  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);\n'
-                         '  if (_ret == NULL)\n'
-                         '    goto _out;\n')
-            self.c.write('  g_variant_get (_ret,\n'
-                         '                 \"(')
-            for a in m.out_args:
-                self.c.write('%s'%(a.format_out))
-            self.c.write(')"')
-            for a in m.out_args:
-                self.c.write(',\n                 out_%s'%(a.name))
-            self.c.write(');\n'
-                         '  g_variant_unref (_ret);\n')
-            self.c.write('_out:\n'
-                         '  return _ret != NULL;\n'
-                         '}\n'
-                         '\n')
-
-
-            # sync
-            self.c.write('/**\n'
-                         ' * %s_call_%s_sync:\n'
-                         ' * @proxy: A #%sProxy.\n'
-                         %(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.in_args:
-                self.c.write(' * @%s: Argument to pass with the method invocation.\n'%(a.name))
-            for a in m.out_args:
-                self.c.write(' * @out_%s: (out): Return location for return parameter or %%NULL to ignore.\n'%(a.name))
-            self.c.write(self.docbook_gen.expand(
-                    ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                    ' * @error: Return location for error or %%NULL.\n'
-                    ' *\n'
-                    ' * Synchronously invokes the %s.%s() D-Bus method on @proxy. The calling thread is blocked until a reply is received.\n'
-                    ' *\n'
-                    ' * See %s_call_%s() for the asynchronous version of this method.\n'
-                    ' *\n'
-                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
-                    %(i.name, m.name, i.name_lower, m.name_lower), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
-            self.c.write('gboolean\n'
-                         '%s_call_%s_sync (\n'
-                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.in_args:
-                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
-            for a in m.out_args:
-                self.c.write(',\n    %sout_%s'%(a.ctype_out, a.name))
-            self.c.write(',\n'
-                         '    GCancellable *cancellable,\n'
-                         '    GError **error)\n'
-                         '{\n'
-                         '  GVariant *_ret;\n')
-            self.c.write('  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),\n'
-                         '    "%s",\n'
-                         '    g_variant_new ("('%(m.name))
-            for a in m.in_args:
-                self.c.write('%s'%(a.format_in))
-            self.c.write(')"')
-            for a in m.in_args:
-                self.c.write(',\n                   %s'%(a.name))
-            self.c.write('),\n'
-                         '    G_DBUS_CALL_FLAGS_NONE,\n'
-                         '    -1,\n'
-                         '    cancellable,\n'
-                         '    error);\n'
-                         '  if (_ret == NULL)\n'
-                         '    goto _out;\n')
-            self.c.write('  g_variant_get (_ret,\n'
-                         '                 \"(')
-            for a in m.out_args:
-                self.c.write('%s'%(a.format_out))
-            self.c.write(')"')
-            for a in m.out_args:
-                self.c.write(',\n                 out_%s'%(a.name))
-            self.c.write(');\n'
-                         '  g_variant_unref (_ret);\n')
-            self.c.write('_out:\n'
-                         '  return _ret != NULL;\n'
-                         '}\n'
-                         '\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_method_completers(self, i):
-        for m in i.methods:
-            self.c.write('/**\n'
-                         ' * %s_complete_%s:\n'
-                         ' * @object: A #%s.\n'
-                         ' * @invocation: (transfer full): A #GDBusMethodInvocation.\n'
-                         %(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.out_args:
-                self.c.write(' * @%s: Parameter to return.\n'%(a.name))
-            self.c.write(self.docbook_gen.expand(
-                    ' *\n'
-                    ' * Helper function used in service implementations to finish handling invocations of the %s.%s() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.\n'
-                    ' *\n'
-                    ' * This method will free @invocation, you cannot use it afterwards.\n'
-                    %(i.name, m.name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
-            self.c.write('void\n'
-                         '%s_complete_%s (\n'
-                         '    %s *object,\n'
-                         '    GDBusMethodInvocation *invocation'%(i.name_lower, m.name_lower, i.camel_name))
-            for a in m.out_args:
-                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
-            self.c.write(')\n'
-                         '{\n')
-
-            self.c.write('  g_dbus_method_invocation_return_value (invocation,\n'
-                         '    g_variant_new ("(')
-            for a in m.out_args:
-                self.c.write('%s'%(a.format_in))
-            self.c.write(')"')
-            for a in m.out_args:
-                self.c.write(',\n                   %s'%(a.name))
-            self.c.write('));\n'
-                         '}\n'
-                         '\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_proxy(self, i):
-        # class boilerplate
-        self.c.write('/* ------------------------------------------------------------------------ */\n'
-                     '\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sProxy:\n'
-                ' *\n'
-                ' * The #%sProxy structure contains only private data and should only be accessed using the provided API.\n'
-                %(i.camel_name, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sProxyClass:\n'
-                ' * @parent_class: The parent class.\n'
-                ' *\n'
-                ' * Class structure for #%sProxy.\n'
-                %(i.camel_name, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write('static void\n'
-                     '%s_proxy_iface_init (%sIface *iface)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'%(i.name_lower, i.camel_name))
-        self.c.write('#define %s_proxy_get_type %s_proxy_get_type\n'%(i.name_lower, i.name_lower))
-        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sProxy, %s_proxy, G_TYPE_DBUS_PROXY,\n'%(i.camel_name, i.name_lower))
-        self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init));\n'%(i.ns_upper, i.name_upper, i.name_lower))
-        self.c.write('#undef %s_proxy_get_type\n'
-                     '\n'%(i.name_lower))
-
-        # property accessors
-        #
-        # Note that we are guaranteed that prop_id starts at 1 and is
-        # laid out in the same order as introspection data pointers
-        #
-        self.c.write('static void\n'
-                     '%s_proxy_get_property (GObject      *object,\n'
-                     '  guint         prop_id,\n'
-                     '  GValue       *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'%(i.name_lower))
-        if len(i.properties) > 0:
-            self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
-                         '  GVariant *variant;\n'
-                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
-                         '  info = _%s_property_info_pointers[prop_id - 1];\n'
-                         '  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);\n'
-                         '  if (info->use_gvariant)\n'
-                         '    {\n'
-                         '      g_value_set_variant (value, variant);\n'
-                         '    }\n'
-                         '  else\n'
-                         '    {\n'
-                         # could be that we don't have the value in cache - in that case, we do
-                         # nothing and the user gets the default value for the GType
-                         '      if (variant != NULL)\n'
-                         '        g_dbus_gvariant_to_gvalue (variant, value);\n'
-                         '    }\n'
-                         '  if (variant != NULL)\n'
-                         '    g_variant_unref (variant);\n'
-                         %(len(i.properties), i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-        if len(i.properties) > 0:
-            self.c.write('static void\n'
-                         '%s_proxy_set_property_cb (GDBusProxy *proxy,\n'
-                         '  GAsyncResult *res,\n'
-                         '  gpointer      user_data)\n'
-                         '{\n'%(i.name_lower))
-            self.c.write('  const _ExtendedGDBusPropertyInfo *info = user_data;\n'
-                         '  GError *error;\n'
-                         '  error = NULL;\n'
-                         '  if (!g_dbus_proxy_call_finish (proxy, res, &error))\n'
-                         '    {\n'
-                         '      g_warning ("Error setting property `%%s\' on interface %s: %%s (%%s, %%d)",\n'
-                         '                 info->parent_struct.name, \n'
-                         '                 error->message, g_quark_to_string (error->domain), error->code);\n'
-                         '      g_error_free (error);\n'
-                         '    }\n'
-                         %(i.name))
-            self.c.write('}\n'
-                         '\n')
-        self.c.write('static void\n'
-                     '%s_proxy_set_property (GObject      *object,\n'
-                     '  guint         prop_id,\n'
-                     '  const GValue *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'%(i.name_lower))
-        if len(i.properties) > 0:
-            self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
-                         '  GVariant *variant;\n'
-                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
-                         '  info = _%s_property_info_pointers[prop_id - 1];\n'
-                         '  variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));\n'
-                         '  g_dbus_proxy_call (G_DBUS_PROXY (object),\n'
-                         '    "org.freedesktop.DBus.Properties.Set",\n'
-                         '    g_variant_new ("(ssv)", "%s", info->parent_struct.name, variant),\n'
-                         '    G_DBUS_CALL_FLAGS_NONE,\n'
-                         '    -1,\n'
-                         '    NULL, (GAsyncReadyCallback) %s_proxy_set_property_cb, (gpointer) info);\n'
-                         '  g_variant_unref (variant);\n'
-                         %(len(i.properties), i.name_lower, i.name, i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        # signal received
-        self.c.write('static void\n'
-                     '%s_proxy_g_signal (GDBusProxy *proxy,\n'
-                     '  const gchar *sender_name,\n'
-                     '  const gchar *signal_name,\n'
-                     '  GVariant *parameters)\n'
-                     '{\n'%(i.name_lower))
-        self.c.write('  _ExtendedGDBusSignalInfo *info;\n'
-                     '  GVariantIter iter;\n'
-                     '  GVariant *child;\n'
-                     '  GValue *paramv;\n'
-                     '  guint num_params;\n'
-                     '  guint n;\n'
-                     '  guint signal_id;\n');
-        # Note: info could be NULL if we are talking to a newer version of the interface
-        self.c.write('  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_%s_interface_info, signal_name);\n'
-                     '  if (info == NULL)\n'
-                     '    return;\n'
-                     %(i.name_lower))
-        self.c.write ('  num_params = g_variant_n_children (parameters);\n'
-                      '  paramv = g_new0 (GValue, num_params + 1);\n'
-                      '  g_value_init (&paramv[0], %sTYPE_%s);\n'
-                      '  g_value_set_object (&paramv[0], proxy);\n'
-                      %(i.ns_upper, i.name_upper))
-        self.c.write('  g_variant_iter_init (&iter, parameters);\n'
-                     '  n = 1;\n'
-                     '  while ((child = g_variant_iter_next_value (&iter)) != NULL)\n'
-                     '    {\n'
-                     '      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];\n'
-                     '      if (arg_info->use_gvariant)\n'
-                     '        {\n'
-                     '          g_value_init (&paramv[n], G_TYPE_VARIANT);\n'
-                     '          g_value_set_variant (&paramv[n], child);\n'
-                     '          n++;\n'
-                     '        }\n'
-                     '      else\n'
-                     '        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);\n'
-                     '      g_variant_unref (child);\n'
-                     '    }\n'
-                     )
-        self.c.write('  signal_id = g_signal_lookup (info->signal_name, %sTYPE_%s);\n'
-                     %(i.ns_upper, i.name_upper))
-        self.c.write('  g_signal_emitv (paramv, signal_id, 0, NULL);\n')
-        self.c.write('  for (n = 0; n < num_params + 1; n++)\n'
-                     '    g_value_unset (&paramv[n]);\n'
-                     '  g_free (paramv);\n')
-        self.c.write('}\n'
-                     '\n')
-
-        # property changed
-        self.c.write('static void\n'
-                     '%s_proxy_g_properties_changed (GDBusProxy *proxy,\n'
-                     '  GVariant *changed_properties,\n'
-                     '  const gchar *const *invalidated_properties)\n'
-                     '{\n'%(i.name_lower))
-        # Note: info could be NULL if we are talking to a newer version of the interface
-        self.c.write('  guint n;\n'
-                     '  const gchar *key;\n'
-                     '  GVariantIter *iter;\n'
-                     '  _ExtendedGDBusPropertyInfo *info;\n'
-                     '  g_variant_get (changed_properties, "a{sv}", &iter);\n'
-                     '  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))\n'
-                     '    {\n'
-                     '      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, key);\n'
-                     '      if (info != NULL)\n'
-                     '        g_object_notify (G_OBJECT (proxy), info->hyphen_name);\n'
-                     '    }\n'
-                     '  g_variant_iter_free (iter);\n'
-                     '  for (n = 0; invalidated_properties[n] != NULL; n++)\n'
-                     '    {\n'
-                     '      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, invalidated_properties[n]);\n'
-                     '      if (info != NULL)\n'
-                     '        g_object_notify (G_OBJECT (proxy), info->hyphen_name);\n'
-                     '    }\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower, i.name_lower))
-
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%s_proxy_init (%sProxy *proxy)\n'
-                     '{\n'
-                     '  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), %s_interface_info ());\n'
-                     '}\n'
-                     '\n'%(i.name_lower, i.camel_name, i.name_lower))
-        self.c.write('static void\n'
-                     '%s_proxy_class_init (%sProxyClass *klass)\n'
-                     '{\n'
-                     '  GObjectClass *gobject_class;\n'
-                     '  GDBusProxyClass *proxy_class;\n'
-                     '\n'
-                     '  gobject_class = G_OBJECT_CLASS (klass);\n'
-                     '  gobject_class->get_property = %s_proxy_get_property;\n'
-                     '  gobject_class->set_property = %s_proxy_set_property;\n'
-                     '\n'
-                     '  proxy_class = G_DBUS_PROXY_CLASS (klass);\n'
-                     '  proxy_class->g_signal = %s_proxy_g_signal;\n'
-                     '  proxy_class->g_properties_changed = %s_proxy_g_properties_changed;\n'
-                     '\n'%(i.name_lower, i.camel_name, i.name_lower, i.name_lower, i.name_lower, i.name_lower))
-        if len(i.properties) > 0:
-            self.c.write('\n'
-                         '  %s_override_properties (gobject_class, 1);\n'%(i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        # constructors
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s_proxy_new:\n'
-                ' * @connection: A #GDBusConnection.\n'
-                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
-                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
-                ' * @user_data: User data to pass to @callback.\n'
-                ' *\n'
-                ' * Asynchronously creates a proxy for the D-Bus interface #%s. See g_dbus_proxy_new() for more details.\n'
-                ' *\n'
-                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
-                ' * You can then call %s_proxy_new_finish() to get the result of the operation.\n'
-                ' *\n'
-                ' * See %s_proxy_new_sync() for the synchronous, blocking version of this constructor.\n'
-                %(i.name_lower, i.name, i.name_lower, i.name_lower), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('void\n'
-                     '%s_proxy_new (\n'
-                     '    GDBusConnection     *connection,\n'
-                     '    GDBusProxyFlags      flags,\n'
-                     '    const gchar         *name,\n'
-                     '    const gchar         *object_path,\n'
-                     '    GCancellable        *cancellable,\n'
-                     '    GAsyncReadyCallback  callback,\n'
-                     '    gpointer             user_data)\n'
-                     '{\n'
-                     '  g_async_initable_new_async (%sTYPE_%s_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower, i.ns_upper, i.name_upper, i.name))
-        self.c.write('/**\n'
-                     ' * %s_proxy_new_finish:\n'
-                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_proxy_new().\n'
-                     ' * @error: Return location for error or %%NULL\n'
-                     ' *\n'
-                     ' * Finishes an operation started with %s_proxy_new().\n'
-                     ' *\n'
-                     ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
-                     %(i.name_lower, i.name_lower, i.name_lower, i.camel_name))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('%s *\n'
-                     '%s_proxy_new_finish (\n'
-                     '    GAsyncResult        *res,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GObject *ret;\n'
-                     '  GObject *source_object;\n'
-                     '  source_object = g_async_result_get_source_object (res);\n'
-                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
-                     '  g_object_unref (source_object);\n'
-                     '  if (ret != NULL)\n'
-                     '    return %s%s (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper))
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s_proxy_new_sync:\n'
-                ' * @connection: A #GDBusConnection.\n'
-                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
-                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @error: Return location for error or %%NULL\n'
-                ' *\n'
-                ' * Synchronously creates a proxy for the D-Bus interface #%s. See g_dbus_proxy_new_sync() for more details.\n'
-                ' *\n'
-                ' * The calling thread is blocked until a reply is received.\n'
-                ' *\n'
-                ' * See %s_proxy_new() for the asynchronous version of this constructor.\n'
-                ' *\n'
-                ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
-                %(i.name_lower, i.name, i.name_lower, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('%s *\n'
-                     '%s_proxy_new_sync (\n'
-                     '    GDBusConnection     *connection,\n'
-                     '    GDBusProxyFlags      flags,\n'
-                     '    const gchar         *name,\n'
-                     '    const gchar         *object_path,\n'
-                     '    GCancellable        *cancellable,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GInitable *ret;\n'
-                     '  ret = g_initable_new (%sTYPE_%s_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
-                     '  if (ret != NULL)\n'
-                     '    return %s%s (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.name, i.ns_upper, i.name_upper))
-        self.c.write('\n')
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s_proxy_new_for_bus:\n'
-                ' * @bus_type: A #GBusType.\n'
-                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
-                ' * @name: A bus name (well-known or unique).\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
-                ' * @user_data: User data to pass to @callback.\n'
-                ' *\n'
-                ' * Like %s_proxy_new() but takes a #GBusType instead of a #GDBusConnection.\n'
-                ' *\n'
-                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
-                ' * You can then call %s_proxy_new_for_bus_finish() to get the result of the operation.\n'
-                ' *\n'
-                ' * See %s_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.\n'
-                %(i.name_lower, i.name_lower, i.name_lower, i.name_lower), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('void\n'
-                     '%s_proxy_new_for_bus (\n'
-                     '    GBusType             bus_type,\n'
-                     '    GDBusProxyFlags      flags,\n'
-                     '    const gchar         *name,\n'
-                     '    const gchar         *object_path,\n'
-                     '    GCancellable        *cancellable,\n'
-                     '    GAsyncReadyCallback  callback,\n'
-                     '    gpointer             user_data)\n'
-                     '{\n'
-                     '  g_async_initable_new_async (%sTYPE_%s_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower, i.ns_upper, i.name_upper, i.name))
-        self.c.write('/**\n'
-                     ' * %s_proxy_new_for_bus_finish:\n'
-                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_proxy_new_for_bus().\n'
-                     ' * @error: Return location for error or %%NULL\n'
-                     ' *\n'
-                     ' * Finishes an operation started with %s_proxy_new_for_bus().\n'
-                     ' *\n'
-                     ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
-                     %(i.name_lower, i.name_lower, i.name_lower, i.camel_name))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('%s *\n'
-                     '%s_proxy_new_for_bus_finish (\n'
-                     '    GAsyncResult        *res,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GObject *ret;\n'
-                     '  GObject *source_object;\n'
-                     '  source_object = g_async_result_get_source_object (res);\n'
-                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
-                     '  g_object_unref (source_object);\n'
-                     '  if (ret != NULL)\n'
-                     '    return %s%s (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper))
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s_proxy_new_for_bus_sync:\n'
-                ' * @bus_type: A #GBusType.\n'
-                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
-                ' * @name: A bus name (well-known or unique).\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @error: Return location for error or %%NULL\n'
-                ' *\n'
-                ' * Like %s_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.\n'
-                ' *\n'
-                ' * The calling thread is blocked until a reply is received.\n'
-                ' *\n'
-                ' * See %s_proxy_new_for_bus() for the asynchronous version of this constructor.\n'
-                ' *\n'
-                ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
-                %(i.name_lower, i.name_lower, i.name_lower, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('%s *\n'
-                     '%s_proxy_new_for_bus_sync (\n'
-                     '    GBusType             bus_type,\n'
-                     '    GDBusProxyFlags      flags,\n'
-                     '    const gchar         *name,\n'
-                     '    const gchar         *object_path,\n'
-                     '    GCancellable        *cancellable,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GInitable *ret;\n'
-                     '  ret = g_initable_new (%sTYPE_%s_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
-                     '  if (ret != NULL)\n'
-                     '    return %s%s (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.name, i.ns_upper, i.name_upper))
-        self.c.write('\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_skeleton(self, i):
-        # class boilerplate
-        self.c.write('/* ------------------------------------------------------------------------ */\n'
-                     '\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sSkeleton:\n'
-                ' *\n'
-                ' * The #%sSkeleton structure contains only private data and should only be accessed using the provided API.\n'
-                %(i.camel_name, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sSkeletonClass:\n'
-                ' * @parent_class: The parent class.\n'
-                ' *\n'
-                ' * Class structure for #%sSkeleton.\n'
-                %(i.camel_name, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('\n')
-
-        self.c.write('struct _%sSkeletonPrivate\n'
-                     '{\n'
-                     '  GValueArray *properties;\n'
-                     '  GList *changed_properties;\n'
-                     '  GSource *changed_properties_idle_source;\n'
-                     '  GMainContext *context;\n'
-                     '  GMutex *lock;\n'
-                     '};\n'
-                     '\n'%i.camel_name)
-
-        self.c.write('static void\n'
-                     '_%s_skeleton_handle_method_call (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
-                     '  const gchar *interface_name,\n'
-                     '  const gchar *method_name,\n'
-                     '  GVariant *parameters,\n'
-                     '  GDBusMethodInvocation *invocation,\n'
-                     '  gpointer user_data)\n'
-                     '{\n'
-                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
-                     '  _ExtendedGDBusMethodInfo *info;\n'
-                     '  GVariantIter iter;\n'
-                     '  GVariant *child;\n'
-                     '  GValue *paramv;\n'
-                     '  guint num_params;\n'
-                     '  guint n;\n'
-                     '  guint signal_id;\n'
-                     '  GValue return_value = {0};\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
-        self.c.write('  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);\n'
-                     '  g_assert (info != NULL);\n'
-                     %())
-        self.c.write ('  num_params = g_variant_n_children (parameters);\n'
-                      '  paramv = g_new0 (GValue, num_params + 2);\n'
-                      '  g_value_init (&paramv[0], %sTYPE_%s);\n'
-                      '  g_value_set_object (&paramv[0], skeleton);\n'
-                      '  g_value_init (&paramv[1], G_TYPE_DBUS_METHOD_INVOCATION);\n'
-                      '  g_value_set_object (&paramv[1], invocation);\n'
-                      %(i.ns_upper, i.name_upper))
-        self.c.write('  g_variant_iter_init (&iter, parameters);\n'
-                     '  n = 2;\n'
-                     '  while ((child = g_variant_iter_next_value (&iter)) != NULL)\n'
-                     '    {\n'
-                     '      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - 2];\n'
-                     '      if (arg_info->use_gvariant)\n'
-                     '        {\n'
-                     '          g_value_init (&paramv[n], G_TYPE_VARIANT);\n'
-                     '          g_value_set_variant (&paramv[n], child);\n'
-                     '          n++;\n'
-                     '        }\n'
-                     '      else\n'
-                     '        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);\n'
-                     '      g_variant_unref (child);\n'
-                     '    }\n'
-                     )
-        self.c.write('  signal_id = g_signal_lookup (info->signal_name, %sTYPE_%s);\n'
-                     %(i.ns_upper, i.name_upper))
-        self.c.write('  g_value_init (&return_value, G_TYPE_BOOLEAN);\n'
-                     '  g_signal_emitv (paramv, signal_id, 0, &return_value);\n'
-                     '  if (!g_value_get_boolean (&return_value))\n'
-                     '    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);\n'
-                     '  g_value_unset (&return_value);\n'
-                     )
-        self.c.write('  for (n = 0; n < num_params + 2; n++)\n'
-                     '    g_value_unset (&paramv[n]);\n'
-                     '  g_free (paramv);\n')
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write('static GVariant *\n'
-                     '_%s_skeleton_handle_get_property (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
-                     '  const gchar *interface_name,\n'
-                     '  const gchar *property_name,\n'
-                     '  GError **error,\n'
-                     '  gpointer user_data)\n'
-                     '{\n'
-                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
-                     '  GValue value = {0};\n'
-                     '  GParamSpec *pspec;\n'
-                     '  _ExtendedGDBusPropertyInfo *info;\n'
-                     '  GVariant *ret;\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
-        self.c.write('  ret = NULL;\n'
-                     '  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, property_name);\n'
-                     '  g_assert (info != NULL);\n'
-                     '  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);\n'
-                     '  if (pspec == NULL)\n'
-                     '    {\n'
-                     '      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %%s", property_name);\n'
-                     '    }\n'
-                     '  else\n'
-                     '    {\n'
-                     '      g_value_init (&value, pspec->value_type);\n'
-                     '      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);\n'
-                     '      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));\n'
-                     '      g_value_unset (&value);\n'
-                     '    }\n'
-                     '  return ret;\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower))
-
-        self.c.write('static gboolean\n'
-                     '_%s_skeleton_handle_set_property (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
-                     '  const gchar *interface_name,\n'
-                     '  const gchar *property_name,\n'
-                     '  GVariant *variant,\n'
-                     '  GError **error,\n'
-                     '  gpointer user_data)\n'
-                     '{\n'
-                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
-                     '  GValue value = {0};\n'
-                     '  GParamSpec *pspec;\n'
-                     '  _ExtendedGDBusPropertyInfo *info;\n'
-                     '  gboolean ret;\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
-        self.c.write('  ret = FALSE;\n'
-                     '  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, property_name);\n'
-                     '  g_assert (info != NULL);\n'
-                     '  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);\n'
-                     '  if (pspec == NULL)\n'
-                     '    {\n'
-                     '      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %%s", property_name);\n'
-                     '    }\n'
-                     '  else\n'
-                     '    {\n'
-                     '      if (info->use_gvariant)\n'
-                     '        g_value_set_variant (&value, variant);\n'
-                     '      else\n'
-                     '        g_dbus_gvariant_to_gvalue (variant, &value);\n'
-                     '      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);\n'
-                     '      g_value_unset (&value);\n'
-                     '      ret = TRUE;\n'
-                     '    }\n'
-                     '  return ret;\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower))
-
-
-        self.c.write('static const GDBusInterfaceVTable _%s_skeleton_vtable =\n'
-                     '{\n'
-                     '  _%s_skeleton_handle_method_call,\n'
-                     '  _%s_skeleton_handle_get_property,\n'
-                     '  _%s_skeleton_handle_set_property\n'
-                     '};\n'
-                     '\n'%(i.name_lower, i.name_lower, i.name_lower, i.name_lower))
-
-        self.c.write('static GDBusInterfaceInfo *\n'
-                     '%s_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)\n'
-                     '{\n'
-                     '  return %s_interface_info ();\n'
-                     %(i.name_lower, i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write('static GDBusInterfaceVTable *\n'
-                     '%s_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)\n'
-                     '{\n'
-                     '  return (GDBusInterfaceVTable *) &_%s_skeleton_vtable;\n'
-                     %(i.name_lower, i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write('static GVariant *\n'
-                     '%s_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)\n'
-                     '{\n'
-                     '  %sSkeleton *skeleton = %s%s_SKELETON (_skeleton);\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
-        self.c.write('\n'
-                     '  GVariantBuilder builder;\n'
-                     '  guint n;\n'
-                     '  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));\n'
-                     '  if (_%s_interface_info.parent_struct.properties == NULL)\n'
-                     '    goto out;\n'
-                     '  for (n = 0; _%s_interface_info.parent_struct.properties[n] != NULL; n++)\n'
-                     '    {\n'
-                     '      GDBusPropertyInfo *info = _%s_interface_info.parent_struct.properties[n];\n'
-                     '      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)\n'
-                     '        {\n'
-                     '          GVariant *value;\n'
-                     '          value = _%s_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "%s", info->name, NULL, skeleton);\n'
-                     '          if (value != NULL)\n'
-                     '            {\n'
-                     '              if (g_variant_is_floating (value))\n'
-                     '                g_variant_ref_sink (value);\n'
-                     '              g_variant_builder_add (&builder, "{sv}", info->name, value);\n'
-                     '              g_variant_unref (value);\n'
-                     '            }\n'
-                     '        }\n'
-                     '    }\n'
-                     'out:\n'
-                     '  return g_variant_builder_end (&builder);\n'
-                     '}\n'
-                     '\n'
-                     %(i.name_lower, i.name_lower, i.name_lower, i.name_lower, i.name))
-
-        if len(i.properties) > 0:
-            self.c.write('static gboolean _%s_emit_changed (gpointer user_data);\n'
-                         '\n'
-                         %(i.name_lower))
-
-        self.c.write('static void\n'
-                     '%s_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)\n'
-                     '{\n'
-                     %(i.name_lower))
-        if len(i.properties) > 0:
-            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (_skeleton);\n'
-                         '  gboolean emit_changed = FALSE;\n'
-                         '\n'
-                         '  g_mutex_lock (skeleton->priv->lock);\n'
-                         '  if (skeleton->priv->changed_properties_idle_source != NULL)\n'
-                         '    {\n'
-                         '      g_source_destroy (skeleton->priv->changed_properties_idle_source);\n'
-                         '      skeleton->priv->changed_properties_idle_source = NULL;\n'
-                         '      emit_changed = TRUE;\n'
-                         '    }\n'
-                         '  g_mutex_unlock (skeleton->priv->lock);\n'
-                         '\n'
-                         '  if (emit_changed)\n'
-                         '    _%s_emit_changed (skeleton);\n'
-                         %(i.camel_name, i.ns_upper, i.name_upper, i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        for s in i.signals:
-            self.c.write('static void\n'
-                         '_%s_on_signal_%s (\n'
-                         '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
-            for a in s.args:
-                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
-            self.c.write(')\n'
-                         '{\n'
-                         '  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
-                         '  GDBusConnection *connection = g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton));\n'
-                         %(i.camel_name, i.ns_upper, i.name_upper))
-            self.c.write('  if (connection == NULL)\n'
-                         '    return;\n'
-                         '  g_dbus_connection_emit_signal (connection,\n'
-                         '    NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "%s", "%s",\n'
-                         '    g_variant_new ("('
-                         %(i.name, s.name))
-            for a in s.args:
-                self.c.write('%s'%(a.format_in))
-            self.c.write(')"')
-            for a in s.args:
-                self.c.write(',\n                   %s'%(a.name))
-            self.c.write('), NULL);\n')
-            self.c.write('}\n'
-                         '\n')
-
-        self.c.write('static void\n'
-                     '%s_skeleton_iface_init (%sIface *iface)\n'
-                     '{\n'
-                     %(i.name_lower, i.camel_name))
-        for s in i.signals:
-            self.c.write('  iface->%s = _%s_on_signal_%s;\n'
-                         %(s.name_lower, i.name_lower, s.name_lower))
-        self.c.write('}\n'
-                     '\n')
-        self.c.write('#define %s_skeleton_get_type %s_skeleton_get_type\n'%(i.name_lower, i.name_lower))
-        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sSkeleton, %s_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,\n'%(i.camel_name, i.name_lower))
-        self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init));\n'%(i.ns_upper, i.name_upper, i.name_lower))
-        self.c.write('#undef %s_skeleton_get_type\n'
-                     '\n'%(i.name_lower))
-
-        # finalize
-        self.c.write('static void\n'
-                     '%s_skeleton_finalize (GObject *object)\n'
-                     '{\n'%(i.name_lower))
-        self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'%(i.camel_name, i.ns_upper, i.name_upper))
-        if len(i.properties) > 0:
-            self.c.write('  g_value_array_free (skeleton->priv->properties);\n')
-        self.c.write('  g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);\n')
-        self.c.write('  g_list_free (skeleton->priv->changed_properties);\n')
-        self.c.write('  if (skeleton->priv->changed_properties_idle_source != NULL)\n')
-        self.c.write('    g_source_destroy (skeleton->priv->changed_properties_idle_source);\n')
-        self.c.write('  if (skeleton->priv->context != NULL)\n')
-        self.c.write('    g_main_context_unref (skeleton->priv->context);\n')
-        self.c.write('  g_mutex_free (skeleton->priv->lock);\n')
-        self.c.write('  G_OBJECT_CLASS (%s_skeleton_parent_class)->finalize (object);\n'
-                     '}\n'
-                     '\n'%(i.name_lower))
-
-        # property accessors (TODO: generate PropertiesChanged signals in setter)
-        if len(i.properties) > 0:
-            self.c.write('static void\n'
-                         '%s_skeleton_get_property (GObject      *object,\n'
-                         '  guint         prop_id,\n'
-                         '  GValue       *value,\n'
-                         '  GParamSpec   *pspec)\n'
-                         '{\n'%(i.name_lower))
-            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
-                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
-                         '  g_mutex_lock (skeleton->priv->lock);\n'
-                         '  g_value_copy (&skeleton->priv->properties->values[prop_id - 1], value);\n'
-                         '  g_mutex_unlock (skeleton->priv->lock);\n'
-                         %(i.camel_name, i.ns_upper, i.name_upper, len(i.properties)))
-            self.c.write('}\n'
-                         '\n')
-
-            # if property is already scheduled then re-use entry.. though it could be
-            # that the user did
-            #
-            #  foo_set_prop_bar (object, "");
-            #  foo_set_prop_bar (object, "blah");
-            #
-            # say, every update... In this case, where nothing happens, we obviously
-            # don't want a PropertiesChanged() event. We can easily check for this
-            # by comparing against the _original value_ recorded before the first
-            # change event. If the latest value is not different from the original
-            # one, we can simply ignore the ChangedProperty
-            #
-            self.c.write('static gboolean\n'
-                         '_%s_emit_changed (gpointer user_data)\n'
-                         '{\n'
-                         '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
-                         %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
-            self.c.write('  GList *l;\n'
-                         '  GVariantBuilder builder;\n'
-                         '  GVariantBuilder invalidated_builder;\n'
-                         '  guint num_changes;\n'
-                         '\n'
-                         '  g_mutex_lock (skeleton->priv->lock);\n'
-                         '  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));\n'
-                         '  g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));\n'
-                         '  for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)\n'
-                         '    {\n'
-                         '      ChangedProperty *cp = l->data;\n'
-                         '      GVariant *variant;\n'
-                         '      const GValue *cur_value;\n'
-                         '\n'
-                         '      cur_value = &skeleton->priv->properties->values[cp->prop_id - 1];\n'
-                         '      if (!_g_value_equal (cur_value, &cp->orig_value))\n'
-                         '        {\n'
-                         '          variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));\n'
-                         '          g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);\n'
-                         '          g_variant_unref (variant);\n'
-                         '          num_changes++;\n'
-                         '        }\n'
-                         '    }\n'
-                         '  if (num_changes > 0)\n'
-                         '    {\n'
-                         '      g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)),\n'
-                         '                                     NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),\n'
-                         '                                     "org.freedesktop.DBus.Properties",\n'
-                         '                                     "PropertiesChanged",\n'
-                         '                                     g_variant_new ("(sa{sv}as)",\n'
-                         '                                                    "%s",\n'
-                         '                                                    &builder, &invalidated_builder),\n'
-                         '                                     NULL);\n'
-                         '    }\n'
-                         '  else\n'
-                         '    {\n'
-                         '      g_variant_builder_clear (&builder);\n'
-                         '      g_variant_builder_clear (&invalidated_builder);\n'
-                         '    }\n'
-                         %(i.name))
-            self.c.write('  g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);\n')
-            self.c.write('  g_list_free (skeleton->priv->changed_properties);\n')
-            self.c.write('  skeleton->priv->changed_properties = NULL;\n')
-            self.c.write('  skeleton->priv->changed_properties_idle_source = NULL;\n')
-            self.c.write('  g_mutex_unlock (skeleton->priv->lock);\n')
-            self.c.write('  return FALSE;\n'
-                         '}\n'
-                         '\n')
-            # holding lock while being called
-            self.c.write('static void\n'
-                         '_%s_schedule_emit_changed (%sSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)\n'
-                         '{\n'
-                         '  ChangedProperty *cp;\n'
-                         '  GList *l;\n'
-                         '  cp = NULL;\n'
-                         '  for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)\n'
-                         '    {\n'
-                         '      ChangedProperty *i_cp = l->data;\n'
-                         '      if (i_cp->info == info)\n'
-                         '        {\n'
-                         '          cp = i_cp;\n'
-                         '          break;\n'
-                         '        }\n'
-                         '    }\n'
-                         %(i.name_lower, i.camel_name))
-            self.c.write('  if (cp == NULL)\n'
-                         '    {\n'
-                         '      cp = g_new0 (ChangedProperty, 1);\n'
-                         '      cp->prop_id = prop_id;\n'
-                         '      cp->info = info;\n'
-                         '      skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);\n'
-                         '      g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));\n'
-                         '      g_value_copy (orig_value, &cp->orig_value);\n'
-                         '    }\n'
-                         '}\n'
-                         '\n'
-                         %())
-
-            # Postpone setting up the refresh source until the ::notify signal is emitted as
-            # this allows use of g_object_freeze_notify()/g_object_thaw_notify() ...
-            # This is useful when updating several properties from another thread than
-            # where the idle will be emitted from
-            self.c.write('static void\n'
-                         '%s_skeleton_notify (GObject      *object,\n'
-                         '  GParamSpec *pspec)\n'
-                         '{\n'
-                         '  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
-                         '  g_mutex_lock (skeleton->priv->lock);\n'
-                         '  if (skeleton->priv->changed_properties != NULL &&\n'
-                         '      skeleton->priv->changed_properties_idle_source == NULL)\n'
-                         '    {\n'
-                         '      skeleton->priv->changed_properties_idle_source = g_idle_source_new ();\n'
-                         '      g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);\n'
-                         '      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _%s_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);\n'
-                         '      g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);\n'
-                         '      g_source_unref (skeleton->priv->changed_properties_idle_source);\n'
-                         '    }\n'
-                         '  g_mutex_unlock (skeleton->priv->lock);\n'
-                         '}\n'
-                         '\n'
-                         %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper, i.name_lower))
-
-            self.c.write('static void\n'
-                         '%s_skeleton_set_property (GObject      *object,\n'
-                         '  guint         prop_id,\n'
-                         '  const GValue *value,\n'
-                         '  GParamSpec   *pspec)\n'
-                         '{\n'%(i.name_lower))
-            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
-                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
-                         '  g_mutex_lock (skeleton->priv->lock);\n'
-                         '  g_object_freeze_notify (object);\n'
-                         '  if (!_g_value_equal (value, &skeleton->priv->properties->values[prop_id - 1]))\n'
-                         '    {\n'
-                         '      if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)\n'
-                         '        _%s_schedule_emit_changed (skeleton, _%s_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties->values[prop_id - 1]);\n'
-                         '      g_value_copy (value, &skeleton->priv->properties->values[prop_id - 1]);\n'
-                         '      g_object_notify_by_pspec (object, pspec);\n'
-                         '    }\n'
-                         '  g_mutex_unlock (skeleton->priv->lock);\n'
-                         '  g_object_thaw_notify (object);\n'
-                         %(i.camel_name, i.ns_upper, i.name_upper, len(i.properties), i.name_lower, i.name_lower))
-            self.c.write('}\n'
-                         '\n')
-
-        self.c.write('static void\n'
-                     '%s_skeleton_init (%sSkeleton *skeleton)\n'
-                     '{\n'
-                     '  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, %sTYPE_%s_SKELETON, %sSkeletonPrivate);\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper, i.camel_name))
-        self.c.write('  skeleton->priv->lock = g_mutex_new ();\n')
-        self.c.write('  skeleton->priv->context = g_main_context_get_thread_default ();\n')
-        self.c.write('  if (skeleton->priv->context != NULL)\n')
-        self.c.write('    g_main_context_ref (skeleton->priv->context);\n')
-        if len(i.properties) > 0:
-            self.c.write('  skeleton->priv->properties = g_value_array_new (%d);\n'%(len(i.properties)))
-            n = 0
-            for p in i.properties:
-                self.c.write('  g_value_array_append (skeleton->priv->properties, NULL);\n')
-                self.c.write('  g_value_init (&skeleton->priv->properties->values[%d], %s);\n'%(n, p.arg.gtype))
-                n += 1
-        self.c.write('}\n'
-                     '\n')
-        self.c.write('static void\n'
-                     '%s_skeleton_class_init (%sSkeletonClass *klass)\n'
-                     '{\n'
-                     '  GObjectClass *gobject_class;\n'
-                     '  GDBusInterfaceSkeletonClass *skeleton_class;\n'
-                     '\n'
-                     '  g_type_class_add_private (klass, sizeof (%sSkeletonPrivate));\n'
-                     '\n'
-                     '  gobject_class = G_OBJECT_CLASS (klass);\n'
-                     '  gobject_class->finalize = %s_skeleton_finalize;\n'
-                     %(i.name_lower, i.camel_name, i.camel_name, i.name_lower))
-        if len(i.properties) > 0:
-            self.c.write('  gobject_class->get_property = %s_skeleton_get_property;\n'
-                         '  gobject_class->set_property = %s_skeleton_set_property;\n'
-                         '  gobject_class->notify       = %s_skeleton_notify;\n'
-                         '\n'%(i.name_lower, i.name_lower, i.name_lower))
-            self.c.write('\n'
-                         '  %s_override_properties (gobject_class, 1);\n'%(i.name_lower))
-        self.c.write('\n'
-                     '  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);\n');
-        self.c.write('  skeleton_class->get_info = %s_skeleton_dbus_interface_get_info;\n'%(i.name_lower))
-        self.c.write('  skeleton_class->get_properties = %s_skeleton_dbus_interface_get_properties;\n'%(i.name_lower))
-        self.c.write('  skeleton_class->flush = %s_skeleton_dbus_interface_flush;\n'%(i.name_lower))
-        self.c.write('  skeleton_class->get_vtable = %s_skeleton_dbus_interface_get_vtable;\n'%(i.name_lower))
-        self.c.write('}\n'
-                     '\n')
-
-        # constructors
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %s_skeleton_new:\n'
-                ' *\n'
-                ' * Creates a skeleton object for the D-Bus interface #%s.\n'
-                ' *\n'
-                ' * Returns: (transfer full) (type %sSkeleton): The skeleton object.\n'
-                %(i.name_lower, i.name, i.camel_name), False))
-        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-        self.c.write('%s *\n'
-                     '%s_skeleton_new (void)\n'
-                     '{\n'
-                     '  return %s%s (g_object_new (%sTYPE_%s_SKELETON, NULL));\n'
-                     '}\n'
-                     '\n'%(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_object(self):
-        self.c.write('/* ------------------------------------------------------------------------\n'
-                     ' * Code for Object, ObjectProxy and ObjectSkeleton\n'
-                     ' * ------------------------------------------------------------------------\n'
-                     ' */\n'
-                     '\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * SECTION:%sObject\n'
-                ' * @title: %sObject\n'
-                ' * @short_description: Specialized GDBusObject types\n'
-                ' *\n'
-                ' * This section contains the #%sObject, #%sObjectProxy, and #%sObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.\n'
-                ' */\n'
-                %(self.namespace, self.namespace, self.namespace, self.namespace, self.namespace), False))
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObject:\n'
-                ' *\n'
-                ' * The #%sObject type is a specialized container of interfaces.\n'
-                ' */\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectIface:\n'
-                ' * @parent_iface: The parent interface.\n'
-                ' *\n'
-                ' * Virtual table for the #%sObject interface.\n'
-                ' */\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write('\n')
-
-        self.c.write('static void\n'
-                     '%sobject_default_init (%sObjectIface *iface)\n'
-                     '{\n'
-                     %(self.ns_lower, self.namespace));
-        for i in self.ifaces:
-            self.c.write(self.docbook_gen.expand(
-                    '  /**\n'
-                    '   * %sObject:%s:\n'
-                    '   *\n'
-                    '   * The #%s instance corresponding to the D-Bus interface #%s, if any.\n'
-                    '   *\n'
-                    '   * Connect to the #GObject::notify signal to get informed of property changes.\n'
-                    %(self.namespace, i.name_hyphen, i.camel_name, i.name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 2)
-            self.c.write('  g_object_interface_install_property (iface, g_param_spec_object ("%s", "%s", "%s", %sTYPE_%s, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));\n'
-                         '\n'
-                         %(i.name_hyphen, i.name_hyphen, i.name_hyphen, self.ns_upper, i.name_upper))
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write('typedef %sObjectIface %sObjectInterface;\n'%(self.namespace, self.namespace))
-        self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));\n'%(self.namespace, self.ns_lower))
-        self.c.write('\n')
-
-        for i in self.ifaces:
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %sobject_get_%s:\n'
-                    ' * @object: A #%sObject.\n'
-                    ' *\n'
-                    ' * Gets the #%s instance for the D-Bus interface #%s on @object, if any.\n'
-                    ' *\n'
-                    ' * Returns: (transfer full): A #%s that must be freed with g_object_unref() or %%NULL if @object does not implement the interface.\n'
-                    %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name, i.name, i.camel_name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-            self.c.write ('%s *%sobject_get_%s (%sObject *object)\n'
-                          %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
-            self.c.write('{\n'
-                         '  GDBusInterface *ret;\n'
-                         '  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
-                         '  if (ret == NULL)\n'
-                         '    return NULL;\n'
-                         '  return %s%s (ret);\n'
-                         '}\n'
-                         '\n'
-                         %(i.name, self.ns_upper, i.name_upper))
-        self.c.write('\n')
-        for i in self.ifaces:
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %sobject_peek_%s: (skip)\n'
-                    ' * @object: A #%sObject.\n'
-                    ' *\n'
-                    ' * Like %sobject_get_%s() but doesn\' increase the reference count on the returned object.\n'
-                    ' *\n'
-                    ' * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>\n'
-                    ' *\n'
-                    ' * Returns: (transfer none): A #%s or %%NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.\n'
-                    %(self.ns_lower, i.name_upper.lower(), self.namespace, self.ns_lower, i.name_upper.lower(), i.camel_name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-            self.c.write ('%s *%sobject_peek_%s (%sObject *object)\n'
-                          %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
-            self.c.write('{\n'
-                         '  GDBusInterface *ret;\n'
-                         '  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
-                         '  if (ret == NULL)\n'
-                         '    return NULL;\n'
-                         '  g_object_unref (ret);\n'
-                         '  return %s%s (ret);\n'
-                         '}\n'
-                         '\n'
-                         %(i.name, self.ns_upper, i.name_upper))
-        self.c.write('\n')
-        # shared by ObjectProxy and ObjectSkeleton classes
-        self.c.write('static void\n'
-                     '%sobject_notify (GDBusObject *object, GDBusInterface *interface)\n'
-                     '{\n'
-                     '  g_object_notify (G_OBJECT (object), ((_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface))->hyphen_name);\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower))
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectProxy:\n'
-                ' *\n'
-                ' * The #%sObjectProxy structure contains only private data and should only be accessed using the provided API.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectProxyClass:\n'
-                ' * @parent_class: The parent class.\n'
-                ' *\n'
-                ' * Class structure for #%sObjectProxy.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%sobject_proxy__%sobject_iface_init (%sObjectIface *iface)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_lower, self.namespace))
-        self.c.write('static void\n'
-                     '%sobject_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)\n'
-                     '{\n'
-                     '  iface->interface_added = %sobject_notify;\n'
-                     '  iface->interface_removed = %sobject_notify;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_lower, self.ns_lower))
-        self.c.write('\n')
-        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectProxy, %sobject_proxy, G_TYPE_DBUS_OBJECT_PROXY,\n'
-                     '                         G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_proxy__%sobject_iface_init)\n'
-                     '                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_proxy__g_dbus_object_iface_init));\n'
-                     '\n'
-                     %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%sobject_proxy_init (%sObjectProxy *object)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'%(self.ns_lower, self.namespace))
-        self.c.write('static void\n'
-                     '%sobject_proxy_set_property (GObject      *_object,\n'
-                     '  guint         prop_id,\n'
-                     '  const GValue *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'
-                     '  G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
-                     %(self.ns_lower))
-        self.c.write('}\n'
-                     '\n'%())
-        self.c.write('static void\n'
-                     '%sobject_proxy_get_property (GObject      *_object,\n'
-                     '  guint         prop_id,\n'
-                     '  GValue       *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'
-                     '  %sObjectProxy *object = %sOBJECT_PROXY (_object);\n'
-                     '  GDBusInterface *interface;\n'
-                     '\n'
-                     '  switch (prop_id)\n'
-                     '    {\n'
-                     %(self.ns_lower, self.namespace, self.ns_upper))
-        n = 1
-        for i in self.ifaces:
-            self.c.write('    case %d:\n'
-                         '      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
-                         '      g_value_take_object (value, interface);\n'
-                         '      break;\n'
-                         '\n'
-                         %(n, i.name))
-            n += 1
-        self.c.write('    default:\n'
-                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
-                     '      break;\n'
-                     '  }\n'
-                     '}\n'
-                     '\n'%())
-        self.c.write('static void\n'
-                     '%sobject_proxy_class_init (%sObjectProxyClass *klass)\n'
-                     '{\n'
-                     '  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);\n'
-                     '\n'
-                     '  gobject_class->set_property = %sobject_proxy_set_property;\n'
-                     '  gobject_class->get_property = %sobject_proxy_get_property;\n'
-                     '\n'
-                     %(self.ns_lower, self.namespace, self.ns_lower, self.ns_lower))
-        n = 1
-        for i in self.ifaces:
-            self.c.write('  g_object_class_override_property (gobject_class, %d, "%s");'
-                         '\n'
-                         %(n, i.name_hyphen))
-            n += 1
-        self.c.write('}\n'
-                     '\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_proxy_new:\n'
-                ' * @connection: A #GDBusConnection.\n'
-                ' * @object_path: An object path.\n'
-                ' *\n'
-                ' * Creates a new proxy object.\n'
-                ' *\n'
-                ' * Returns: (transfer full): The proxy object.\n'
-                ' */\n'
-                %(self.ns_lower), False))
-        self.c.write('%sObjectProxy *\n'
-                     '%sobject_proxy_new (GDBusConnection *connection,\n'
-                     '  const gchar *object_path)\n'
-                     '{\n'
-                     '  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);\n'
-                     '  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n'
-                     '  return %sOBJECT_PROXY (g_object_new (%sTYPE_OBJECT_PROXY, "connection", connection, "object-path", object_path, NULL));\n'
-                     '}\n'
-                     '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper))
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectSkeleton:\n'
-                ' *\n'
-                ' * The #%sObjectSkeleton structure contains only private data and should only be accessed using the provided API.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectSkeletonClass:\n'
-                ' * @parent_class: The parent class.\n'
-                ' *\n'
-                ' * Class structure for #%sObjectSkeleton.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%sobject_skeleton__%sobject_iface_init (%sObjectIface *iface)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_lower, self.namespace))
-        self.c.write('\n')
-        self.c.write('static void\n'
-                     '%sobject_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)\n'
-                     '{\n'
-                     '  iface->interface_added = %sobject_notify;\n'
-                     '  iface->interface_removed = %sobject_notify;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_lower, self.ns_lower))
-        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectSkeleton, %sobject_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,\n'
-                     '                         G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_skeleton__%sobject_iface_init)\n'
-                     '                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_skeleton__g_dbus_object_iface_init));\n'
-                     '\n'
-                     %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%sobject_skeleton_init (%sObjectSkeleton *object)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'%(self.ns_lower, self.namespace))
-        self.c.write('static void\n'
-                     '%sobject_skeleton_set_property (GObject      *_object,\n'
-                     '  guint         prop_id,\n'
-                     '  const GValue *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'
-                     '  %sObjectSkeleton *object = %sOBJECT_SKELETON (_object);\n'
-                     '  GDBusInterfaceSkeleton *interface;\n'
-                     '\n'
-                     '  switch (prop_id)\n'
-                     '    {\n'
-                     %(self.ns_lower, self.namespace, self.ns_upper))
-        n = 1
-        for i in self.ifaces:
-            self.c.write('    case %d:\n'
-                         '      interface = g_value_get_object (value);\n'
-                         '      if (interface != NULL)\n'
-                         '        {\n'
-                         '          g_warn_if_fail (%sIS_%s (interface));\n'
-                         '          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);\n'
-                         '        }\n'
-                         '      else\n'
-                         '        {\n'
-                         '          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "%s");\n'
-                         '        }\n'
-                         '      break;\n'
-                         '\n'
-                         %(n, self.ns_upper, i.name_upper, i.name))
-            n += 1
-        self.c.write('    default:\n'
-                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
-                     '      break;\n'
-                     '  }\n'
-                     '}\n'
-                     '\n'%())
-        self.c.write('static void\n'
-                     '%sobject_skeleton_get_property (GObject      *_object,\n'
-                     '  guint         prop_id,\n'
-                     '  GValue       *value,\n'
-                     '  GParamSpec   *pspec)\n'
-                     '{\n'
-                     '  %sObjectSkeleton *object = %sOBJECT_SKELETON (_object);\n'
-                     '  GDBusInterface *interface;\n'
-                     '\n'
-                     '  switch (prop_id)\n'
-                     '    {\n'
-                     %(self.ns_lower, self.namespace, self.ns_upper))
-        n = 1
-        for i in self.ifaces:
-            self.c.write('    case %d:\n'
-                         '      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
-                         '      g_value_take_object (value, interface);\n'
-                         '      break;\n'
-                         '\n'
-                         %(n, i.name))
-            n += 1
-        self.c.write('    default:\n'
-                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
-                     '      break;\n'
-                     '  }\n'
-                     '}\n'
-                     '\n'%())
-        self.c.write('static void\n'
-                     '%sobject_skeleton_class_init (%sObjectSkeletonClass *klass)\n'
-                     '{\n'
-                     '  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);\n'
-                     '\n'
-                     '  gobject_class->set_property = %sobject_skeleton_set_property;\n'
-                     '  gobject_class->get_property = %sobject_skeleton_get_property;\n'
-                     '\n'
-                     %(self.ns_lower, self.namespace, self.ns_lower, self.ns_lower))
-        n = 1
-        for i in self.ifaces:
-            self.c.write('  g_object_class_override_property (gobject_class, %d, "%s");'
-                         '\n'
-                         %(n, i.name_hyphen))
-            n += 1
-        self.c.write('}\n'
-                     '\n')
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_skeleton_new:\n'
-                ' * @object_path: An object path.\n'
-                ' *\n'
-                ' * Creates a new skeleton object.\n'
-                ' *\n'
-                ' * Returns: (transfer full): The skeleton object.\n'
-                ' */\n'
-                %(self.ns_lower), False))
-        self.c.write('%sObjectSkeleton *\n'
-                     '%sobject_skeleton_new (const gchar *object_path)\n'
-                     '{\n'
-                     '  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n'
-                     '  return %sOBJECT_SKELETON (g_object_new (%sTYPE_OBJECT_SKELETON, "object-path", object_path, NULL));\n'
-                     '}\n'
-                     '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper))
-        for i in self.ifaces:
-            self.c.write(self.docbook_gen.expand(
-                    '/**\n'
-                    ' * %sobject_skeleton_set_%s:\n'
-                    ' * @object: A #%sObjectSkeleton.\n'
-                    ' * @interface_: (allow-none): A #%s or %%NULL to clear the interface.\n'
-                    ' *\n'
-                    ' * Sets the #%s instance for the D-Bus interface #%s on @object.\n'
-                    %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name, i.camel_name, i.name), False))
-            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
-            self.c.write ('void %sobject_skeleton_set_%s (%sObjectSkeleton *object, %s *interface_)\n'
-                          %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name))
-            self.c.write('{\n'
-                         '  g_object_set (G_OBJECT (object), "%s", interface_, NULL);\n'
-                         '}\n'
-                         '\n'
-                         %(i.name_hyphen))
-        self.c.write('\n')
-
-
-    def generate_object_manager_client(self):
-        self.c.write('/* ------------------------------------------------------------------------\n'
-                     ' * Code for ObjectManager client\n'
-                     ' * ------------------------------------------------------------------------\n'
-                     ' */\n'
-                     '\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * SECTION:%sObjectManagerClient\n'
-                ' * @title: %sObjectManagerClient\n'
-                ' * @short_description: Generated GDBusObjectManagerClient type\n'
-                ' *\n'
-                ' * This section contains a #GDBusObjectManagerClient that uses %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.\n'
-                ' */\n'
-                %(self.namespace, self.namespace, self.ns_lower), False))
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectManagerClient:\n'
-                ' *\n'
-                ' * The #%sObjectManagerClient structure contains only private data and should only be accessed using the provided API.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sObjectManagerClientClass:\n'
-                ' * @parent_class: The parent class.\n'
-                ' *\n'
-                ' * Class structure for #%sObjectManagerClient.\n'
-                %(self.namespace, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('\n')
-
-        # class boilerplate
-        self.c.write('G_DEFINE_TYPE (%sObjectManagerClient, %sobject_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);\n'
-                     '\n'
-                     %(self.namespace, self.ns_lower))
-
-        # class boilerplate
-        self.c.write('static void\n'
-                     '%sobject_manager_client_init (%sObjectManagerClient *manager)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'%(self.ns_lower, self.namespace))
-        self.c.write('static void\n'
-                     '%sobject_manager_client_class_init (%sObjectManagerClientClass *klass)\n'
-                     '{\n'
-                     '}\n'
-                     '\n'%(self.ns_lower, self.namespace))
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_manager_client_get_proxy_type:\n'
-                ' * @manager: A #GDBusObjectManagerClient.\n'
-                ' * @object_path: The object path of the remote object (unused).\n'
-                ' * @interface_name: (allow-none): Interface name of the remote object or %%NULL to get the object proxy #GType.\n'
-                ' * @user_data: User data (unused).\n'
-                ' *\n'
-                ' * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.\n'
-                ' *\n'
-                ' * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %%NULL, otherwise the #GType for #%sObjectProxy.\n'
-                %(self.ns_lower, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('GType\n'
-                     '%sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data)\n'
-                     '{\n'
-                     %(self.ns_lower))
-        self.c.write('  static gsize once_init_value = 0;\n'
-                     '  static GHashTable *lookup_hash;\n'
-                     '  GType ret;\n'
-                     '\n'
-                     '  if (interface_name == NULL)\n'
-                     '    return %sTYPE_OBJECT_PROXY;\n'
-                     '  if (g_once_init_enter (&once_init_value))\n'
-                     '    {\n'
-                     '      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);\n'
-                     %(self.ns_upper))
-        for i in self.ifaces:
-            self.c.write('      g_hash_table_insert (lookup_hash, "%s", GSIZE_TO_POINTER (%sTYPE_%s_PROXY));\n'
-                         %(i.name, i.ns_upper, i.name_upper))
-        self.c.write('      g_once_init_leave (&once_init_value, 1);\n'
-                     '    }\n')
-        self.c.write('  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));\n'
-                     '  if (ret == (GType) 0)\n'
-                     '    ret = G_TYPE_DBUS_PROXY;\n')
-        self.c.write('  return ret;\n'
-                     '}\n'
-                     '\n')
-
-        # constructors
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_manager_client_new:\n'
-                ' * @connection: A #GDBusConnection.\n'
-                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
-                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
-                ' * @user_data: User data to pass to @callback.\n'
-                ' *\n'
-                ' * Asynchronously creates #GDBusObjectManagerClient using %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.\n'
-                ' *\n'
-                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
-                ' * You can then call %sobject_manager_client_new_finish() to get the result of the operation.\n'
-                ' *\n'
-                ' * See %sobject_manager_client_new_sync() for the synchronous, blocking version of this constructor.\n'
-                %(self.ns_lower, self.ns_lower, self.ns_lower, self.ns_lower), False))
-        self.c.write(' */\n')
-        self.c.write('void\n'
-                     '%sobject_manager_client_new (\n'
-                     '    GDBusConnection        *connection,\n'
-                     '    GDBusObjectManagerClientFlags  flags,\n'
-                     '    const gchar            *name,\n'
-                     '    const gchar            *object_path,\n'
-                     '    GCancellable           *cancellable,\n'
-                     '    GAsyncReadyCallback     callback,\n'
-                     '    gpointer                user_data)\n'
-                     '{\n'
-                     '  g_async_initable_new_async (%sTYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_upper, self.ns_lower))
-        self.c.write('/**\n'
-                     ' * %sobject_manager_client_new_finish:\n'
-                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %sobject_manager_client_new().\n'
-                     ' * @error: Return location for error or %%NULL\n'
-                     ' *\n'
-                     ' * Finishes an operation started with %sobject_manager_client_new().\n'
-                     ' *\n'
-                     ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
-                     %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace))
-        self.c.write(' */\n')
-        self.c.write('GDBusObjectManager *\n'
-                     '%sobject_manager_client_new_finish (\n'
-                     '    GAsyncResult        *res,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GObject *ret;\n'
-                     '  GObject *source_object;\n'
-                     '  source_object = g_async_result_get_source_object (res);\n'
-                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
-                     '  g_object_unref (source_object);\n'
-                     '  if (ret != NULL)\n'
-                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower))
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_manager_client_new_sync:\n'
-                ' * @connection: A #GDBusConnection.\n'
-                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
-                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @error: Return location for error or %%NULL\n'
-                ' *\n'
-                ' * Synchronously creates #GDBusObjectManagerClient using %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.\n'
-                ' *\n'
-                ' * The calling thread is blocked until a reply is received.\n'
-                ' *\n'
-                ' * See %sobject_manager_client_new() for the asynchronous version of this constructor.\n'
-                ' *\n'
-                ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
-                %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('GDBusObjectManager *\n'
-                     '%sobject_manager_client_new_sync (\n'
-                     '    GDBusConnection        *connection,\n'
-                     '    GDBusObjectManagerClientFlags  flags,\n'
-                     '    const gchar            *name,\n'
-                     '    const gchar            *object_path,\n'
-                     '    GCancellable           *cancellable,\n'
-                     '    GError                **error)\n'
-                     '{\n'
-                     '  GInitable *ret;\n'
-                     '  ret = g_initable_new (%sTYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
-                     '  if (ret != NULL)\n'
-                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_upper, self.ns_lower))
-        self.c.write('\n')
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_manager_client_new_for_bus:\n'
-                ' * @bus_type: A #GBusType.\n'
-                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
-                ' * @name: A bus name (well-known or unique).\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
-                ' * @user_data: User data to pass to @callback.\n'
-                ' *\n'
-                ' * Like %sobject_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.\n'
-                ' *\n'
-                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
-                ' * You can then call %sobject_manager_client_new_for_bus_finish() to get the result of the operation.\n'
-                ' *\n'
-                ' * See %sobject_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.\n'
-                %(self.ns_lower, self.ns_lower, self.ns_lower, self.ns_lower), False))
-        self.c.write(' */\n')
-        self.c.write('void\n'
-                     '%sobject_manager_client_new_for_bus (\n'
-                     '    GBusType                bus_type,\n'
-                     '    GDBusObjectManagerClientFlags  flags,\n'
-                     '    const gchar            *name,\n'
-                     '    const gchar            *object_path,\n'
-                     '    GCancellable           *cancellable,\n'
-                     '    GAsyncReadyCallback     callback,\n'
-                     '    gpointer                user_data)\n'
-                     '{\n'
-                     '  g_async_initable_new_async (%sTYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_upper, self.ns_lower))
-        self.c.write('/**\n'
-                     ' * %sobject_manager_client_new_for_bus_finish:\n'
-                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %sobject_manager_client_new_for_bus().\n'
-                     ' * @error: Return location for error or %%NULL\n'
-                     ' *\n'
-                     ' * Finishes an operation started with %sobject_manager_client_new_for_bus().\n'
-                     ' *\n'
-                     ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
-                     %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace))
-        self.c.write(' */\n')
-        self.c.write('GDBusObjectManager *\n'
-                     '%sobject_manager_client_new_for_bus_finish (\n'
-                     '    GAsyncResult        *res,\n'
-                     '    GError             **error)\n'
-                     '{\n'
-                     '  GObject *ret;\n'
-                     '  GObject *source_object;\n'
-                     '  source_object = g_async_result_get_source_object (res);\n'
-                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
-                     '  g_object_unref (source_object);\n'
-                     '  if (ret != NULL)\n'
-                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower))
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * %sobject_manager_client_new_for_bus_sync:\n'
-                ' * @bus_type: A #GBusType.\n'
-                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
-                ' * @name: A bus name (well-known or unique).\n'
-                ' * @object_path: An object path.\n'
-                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
-                ' * @error: Return location for error or %%NULL\n'
-                ' *\n'
-                ' * Like %sobject_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.\n'
-                ' *\n'
-                ' * The calling thread is blocked until a reply is received.\n'
-                ' *\n'
-                ' * See %sobject_manager_client_new_for_bus() for the asynchronous version of this constructor.\n'
-                ' *\n'
-                ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
-                %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace), False))
-        self.c.write(' */\n')
-        self.c.write('GDBusObjectManager *\n'
-                     '%sobject_manager_client_new_for_bus_sync (\n'
-                     '    GBusType                bus_type,\n'
-                     '    GDBusObjectManagerClientFlags  flags,\n'
-                     '    const gchar            *name,\n'
-                     '    const gchar            *object_path,\n'
-                     '    GCancellable           *cancellable,\n'
-                     '    GError                **error)\n'
-                     '{\n'
-                     '  GInitable *ret;\n'
-                     '  ret = g_initable_new (%sTYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
-                     '  if (ret != NULL)\n'
-                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
-                     '  else\n'
-                     '    return NULL;\n'
-                     '}\n'
-                     '\n'
-                     %(self.ns_lower, self.ns_upper, self.ns_lower))
-        self.c.write('\n')
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def write_gtkdoc_deprecated_and_since_and_close(self, obj, f, indent):
-        if len(obj.since) > 0:
-            f.write('%*s *\n'
-                    '%*s * Since: %s\n'
-                    %(indent, '', indent, '', obj.since))
-        if obj.deprecated:
-            if isinstance(obj, dbustypes.Interface):
-                thing = 'The D-Bus interface'
-            elif isinstance(obj, dbustypes.Method):
-                thing = 'The D-Bus method'
-            elif isinstance(obj, dbustypes.Signal):
-                thing = 'The D-Bus signal'
-            elif isinstance(obj, dbustypes.Property):
-                thing = 'The D-Bus property'
-            else:
-                raise RuntimeError('Cannot handle object ', obj)
-            f.write(self.docbook_gen.expand(
-                    '%*s *\n'
-                    '%*s * Deprecated: %s has been deprecated.\n'
-                    %(indent, '', indent, '', thing), False))
-        f.write('%*s */\n'%(indent, ''))
-
-    # ---------------------------------------------------------------------------------------------------
-
-    def generate_interface_intro(self, i):
-        self.c.write('/* ------------------------------------------------------------------------\n'
-                     ' * Code for interface %s\n'
-                     ' * ------------------------------------------------------------------------\n'
-                     ' */\n'
-                     '\n'%(i.name))
-
-        self.c.write(self.docbook_gen.expand(
-                '/**\n'
-                ' * SECTION:%s\n'
-                ' * @title: %s\n'
-                ' * @short_description: Generated C code for the %s D-Bus interface\n'
-                ' *\n'
-                ' * This section contains code for working with the #%s D-Bus interface in C.\n'
-                ' */\n'
-                %(i.camel_name, i.camel_name, i.name, i.name), False))
-        self.c.write('\n')
-
-    def generate(self):
-        self.generate_intro()
-        self.declare_types()
-        for i in self.ifaces:
-            self.generate_interface_intro(i)
-            self.generate_introspection_for_interface(i)
-            self.generate_interface(i)
-            self.generate_property_accessors(i)
-            self.generate_signal_emitters(i)
-            self.generate_method_calls(i)
-            self.generate_method_completers(i)
-            self.generate_proxy(i)
-            self.generate_skeleton(i)
-        if self.generate_objmanager:
-            self.generate_object()
-            self.generate_object_manager_client()
-        self.generate_outro()
diff --git a/gio/gdbus-codegen/codegen_docbook.py b/gio/gdbus-codegen/codegen_docbook.py
deleted file mode 100644
index 87eb3e5..0000000
--- a/gio/gdbus-codegen/codegen_docbook.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import sys
-import re
-
-import config
-import utils
-import dbustypes
-import parser
-
-# ----------------------------------------------------------------------------------------------------
-
-class DocbookCodeGenerator:
-    def __init__(self, ifaces, docbook):
-        self.ifaces = ifaces
-        self.docbook = docbook
-        self.generate_expand_dicts()
-
-    def print_method_prototype(self, i, m, in_synopsis):
-        max_method_len = 0
-        if in_synopsis:
-            for _m in i.methods:
-                max_method_len = max(len(_m.name), max_method_len)
-        else:
-            max_method_len = max(len(m.name), max_method_len)
-
-        max_signature_len = 0
-        if in_synopsis:
-            for _m in i.methods:
-                for a in _m.in_args:
-                    max_signature_len = max(len(a.signature), max_signature_len)
-                for a in _m.out_args:
-                    max_signature_len = max(len(a.signature), max_signature_len)
-        else:
-            for a in m.in_args:
-                max_signature_len = max(len(a.signature), max_signature_len)
-            for a in m.out_args:
-                max_signature_len = max(len(a.signature), max_signature_len)
-
-        if in_synopsis:
-            self.out.write('<link linkend="gdbus-method-%s.%s">%s</link>%*s ('
-                           %(utils.dots_to_hyphens(i.name), m.name, m.name, max_method_len - len(m.name), ''))
-        else:
-            self.out.write('%s%*s ('
-                           %(m.name, max_method_len - len(m.name), ''))
-        count = 0
-        for a in m.in_args:
-            if (count > 0):
-                self.out.write(',\n%*s'%(max_method_len + 2, ''))
-            self.out.write('IN  %s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
-            count = count + 1
-        for a in m.out_args:
-            if (count > 0):
-                self.out.write(',\n%*s'%(max_method_len + 2, ''))
-            self.out.write('OUT %s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
-            count = count + 1
-        self.out.write(');\n')
-
-    def print_signal_prototype(self, i, s, in_synopsis):
-        max_signal_len = 0
-        if in_synopsis:
-            for _s in i.signals:
-                max_signal_len = max(len(_s.name), max_signal_len)
-        else:
-            max_signal_len = max(len(s.name), max_signal_len)
-
-        max_signature_len = 0
-        if in_synopsis:
-            for _s in i.signals:
-                for a in _s.args:
-                    max_signature_len = max(len(a.signature), max_signature_len)
-        else:
-            for a in s.args:
-                max_signature_len = max(len(a.signature), max_signature_len)
-
-        if in_synopsis:
-            self.out.write('<link linkend="gdbus-signal-%s.%s">%s</link>%*s ('
-                           %(utils.dots_to_hyphens(i.name), s.name, s.name, max_signal_len - len(s.name), ''))
-        else:
-            self.out.write('%s%*s ('
-                           %(s.name, max_signal_len - len(s.name), ''))
-        count = 0
-        for a in s.args:
-            if (count > 0):
-                self.out.write(',\n%*s'%(max_signal_len + 2, ''))
-            self.out.write('%s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
-            count = count + 1
-        self.out.write(');\n')
-
-    def print_property_prototype(self, i, p, in_synopsis):
-        max_property_len = 0
-        if in_synopsis:
-            for _p in i.properties:
-                max_property_len = max(len(_p.name), max_property_len)
-        else:
-            max_property_len = max(len(p.name), max_property_len)
-
-        max_signature_len = 0
-        if in_synopsis:
-            for _p in i.properties:
-                max_signature_len = max(len(_p.signature), max_signature_len)
-        else:
-            max_signature_len = max(len(p.signature), max_signature_len)
-
-        if in_synopsis:
-            self.out.write('<link linkend="gdbus-property-%s.%s">%s</link>%*s'
-                           %(utils.dots_to_hyphens(i.name), p.name, p.name, max_property_len - len(p.name), ''))
-        else:
-            self.out.write('%s%*s'
-                           %(p.name, max_property_len - len(p.name), ''))
-        if p.readable and p.writable:
-            access = 'readwrite'
-        elif p.readable:
-            access = 'readable '
-        else:
-            access = 'writable '
-        self.out.write('  %s  %s\n'%(access, p.signature))
-
-
-    def print_synopsis_methods(self, i):
-        self.out.write('  <refsynopsisdiv role="synopsis">\n'%())
-        self.out.write('    <title role="synopsis.title">Methods</title>\n'%())
-        self.out.write('    <synopsis>\n'%())
-        for m in i.methods:
-            self.print_method_prototype(i, m, in_synopsis=True)
-        self.out.write('</synopsis>\n'%())
-        self.out.write('  </refsynopsisdiv>\n'%())
-
-    def print_synopsis_signals(self, i):
-        self.out.write('  <refsect1 role="signal_proto">\n'%())
-        self.out.write('    <title role="signal_proto.title">Signals</title>\n'%())
-        self.out.write('    <synopsis>\n'%())
-        for s in i.signals:
-            self.print_signal_prototype(i, s, in_synopsis=True)
-        self.out.write('</synopsis>\n'%())
-        self.out.write('  </refsect1>\n'%())
-
-    def print_synopsis_properties(self, i):
-        self.out.write('  <refsect1 role="properties">\n'%())
-        self.out.write('    <title role="properties.title">Properties</title>\n'%())
-        self.out.write('    <synopsis>\n'%())
-        for p in i.properties:
-            self.print_property_prototype(i, p, in_synopsis=True)
-        self.out.write('</synopsis>\n'%())
-        self.out.write('  </refsect1>\n'%())
-
-    def print_method(self, i, m):
-        self.out.write('<refsect2 role="method" id="gdbus-method-%s.%s">\n'%(utils.dots_to_hyphens(i.name), m.name))
-        self.out.write('  <title>The %s() method</title>\n'%(m.name))
-        self.out.write('  <indexterm zone="gdbus-method-%s.%s"><primary sortas="%s.%s">%s.%s()</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), m.name, i.name_without_prefix, m.name, i.name, m.name))
-        self.out.write('<programlisting>\n')
-        self.print_method_prototype(i, m, in_synopsis=False)
-        self.out.write('</programlisting>\n')
-        self.out.write('<para>%s</para>\n'%(self.expand(m.doc_string, True)))
-        self.out.write('<variablelist role="params">\n')
-        for a in m.in_args:
-            self.out.write('<varlistentry>\n'%())
-            self.out.write('  <term><literal>IN %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
-            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
-            self.out.write('</varlistentry>\n'%())
-        for a in m.out_args:
-            self.out.write('<varlistentry>\n'%())
-            self.out.write('  <term><literal>OUT %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
-            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
-            self.out.write('</varlistentry>\n'%())
-        self.out.write('</variablelist>\n')
-        if len(m.since) > 0:
-            self.out.write('<para role="since">Since %s</para>\n'%(m.since))
-        if m.deprecated:
-            self.out.write('<warning><para>The %s() method is deprecated.</para></warning>'%(m.name))
-        self.out.write('</refsect2>\n')
-
-    def print_signal(self, i, s):
-        self.out.write('<refsect2 role="signal" id="gdbus-signal-%s.%s">\n'%(utils.dots_to_hyphens(i.name), s.name))
-        self.out.write('  <title>The "%s" signal</title>\n'%(s.name))
-        self.out.write('  <indexterm zone="gdbus-signal-%s.%s"><primary sortas="%s::%s">%s::%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), s.name, i.name_without_prefix, s.name, i.name, s.name))
-        self.out.write('<programlisting>\n')
-        self.print_signal_prototype(i, s, in_synopsis=False)
-        self.out.write('</programlisting>\n')
-        self.out.write('<para>%s</para>\n'%(self.expand(s.doc_string, True)))
-        self.out.write('<variablelist role="params">\n')
-        for a in s.args:
-            self.out.write('<varlistentry>\n'%())
-            self.out.write('  <term><literal>%s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
-            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
-            self.out.write('</varlistentry>\n'%())
-        self.out.write('</variablelist>\n')
-        if len(s.since) > 0:
-            self.out.write('<para role="since">Since %s</para>\n'%(s.since))
-        if s.deprecated:
-            self.out.write('<warning><para>The "%s" signal is deprecated.</para></warning>'%(s.name))
-        self.out.write('</refsect2>\n')
-
-    def print_property(self, i, p):
-        self.out.write('<refsect2 role="property" id="gdbus-property-%s.%s">\n'%(utils.dots_to_hyphens(i.name), p.name))
-        self.out.write('  <title>The "%s" property</title>\n'%(p.name))
-        self.out.write('  <indexterm zone="gdbus-property-%s.%s"><primary sortas="%s:%s">%s:%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), p.name, i.name_without_prefix, p.name, i.name, p.name))
-        self.out.write('<programlisting>\n')
-        self.print_property_prototype(i, p, in_synopsis=False)
-        self.out.write('</programlisting>\n')
-        self.out.write('<para>%s</para>\n'%(self.expand(p.doc_string, True)))
-        if len(p.since) > 0:
-            self.out.write('<para role="since">Since %s</para>\n'%(p.since))
-        if p.deprecated:
-            self.out.write('<warning><para>The "%s" property is deprecated.</para></warning>'%(p.name))
-        self.out.write('</refsect2>\n')
-
-    def expand(self, s, expandParamsAndConstants):
-        for key in self.expand_member_dict_keys:
-            s = s.replace(key, self.expand_member_dict[key])
-        for key in self.expand_iface_dict_keys:
-            s = s.replace(key, self.expand_iface_dict[key])
-        if expandParamsAndConstants:
-            # replace @foo with <parameter>foo</parameter>
-            s = re.sub('@[a-zA-Z0-9_]*', lambda m: '<parameter>' + m.group(0)[1:] + '</parameter>', s)
-            # replace e.g. %TRUE with <constant>TRUE</constant>
-            s = re.sub('%[a-zA-Z0-9_]*', lambda m: '<constant>' + m.group(0)[1:] + '</constant>', s)
-        return s
-
-    def generate_expand_dicts(self):
-        self.expand_member_dict = {}
-        self.expand_iface_dict = {}
-        for i in self.ifaces:
-            key = '#%s'%(i.name)
-            value = '<link linkend="gdbus-interface-%s.top_of_page">%s</link>'%(utils.dots_to_hyphens(i.name), i.name)
-            self.expand_iface_dict[key] = value
-            for m in i.methods:
-                key = '%s.%s()'%(i.name, m.name)
-                value = '<link linkend="gdbus-method-%s.%s">%s()</link>'%(utils.dots_to_hyphens(i.name), m.name, m.name)
-                self.expand_member_dict[key] = value
-            for s in i.signals:
-                key = '#%s::%s'%(i.name, s.name)
-                value = '<link linkend="gdbus-signal-%s.%s">"%s"</link>'%(utils.dots_to_hyphens(i.name), s.name, s.name)
-                self.expand_member_dict[key] = value
-            for p in i.properties:
-                key = '#%s:%s'%(i.name, p.name)
-                value = '<link linkend="gdbus-property-%s.%s">"%s"</link>'%(utils.dots_to_hyphens(i.name), p.name, p.name)
-                self.expand_member_dict[key] = value
-        # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
-        # is evaluated before #org.foo.Iface:Media ...
-        self.expand_member_dict_keys = self.expand_member_dict.keys()
-        self.expand_member_dict_keys.sort(reverse=True)
-        self.expand_iface_dict_keys = self.expand_iface_dict.keys()
-        self.expand_iface_dict_keys.sort(reverse=True)
-
-    def generate(self):
-        for i in self.ifaces:
-            self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
-            self.out.write(''%())
-            self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
-            self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
-            self.out.write('               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [\n'%())
-            self.out.write(']>\n'%())
-            self.out.write('<refentry id="gdbus-%s">\n'%(i.name))
-            self.out.write('  <refmeta>'%())
-            self.out.write('    <refentrytitle role="top_of_page" id="gdbus-interface-%s.top_of_page">%s</refentrytitle>\n'%(utils.dots_to_hyphens(i.name), i.name))
-            self.out.write('  <indexterm zone="gdbus-interface-%s.top_of_page"><primary sortas="%s">%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), i.name_without_prefix, i.name))
-            self.out.write('  </refmeta>'%())
-
-            self.out.write('  <refnamediv>'%())
-            self.out.write('    <refname>%s</refname>'%(i.name))
-            self.out.write('    <refpurpose>%s</refpurpose>'%(i.doc_string_brief))
-            self.out.write('  </refnamediv>'%())
-
-            if len(i.methods) > 0:
-                self.print_synopsis_methods(i)
-            if len(i.signals) > 0:
-                self.print_synopsis_signals(i)
-            if len(i.properties) > 0:
-                self.print_synopsis_properties(i)
-
-            self.out.write('<refsect1 role="desc" id="gdbus-interface-%s">\n'%(utils.dots_to_hyphens(i.name)))
-            self.out.write('  <title role="desc.title">Description</title>\n'%())
-            self.out.write('  <para>%s</para>\n'%(self.expand(i.doc_string, True)))
-            if len(i.since) > 0:
-                self.out.write('  <para role="since">Since %s</para>\n'%(i.since))
-            if i.deprecated:
-                self.out.write('<warning><para>The %s interface is deprecated.</para></warning>'%(i.name))
-            self.out.write('</refsect1>\n'%())
-
-            if len(i.methods) > 0:
-                self.out.write('<refsect1 role="details" id="gdbus-methods-%s">\n'%(i.name))
-                self.out.write('  <title role="details.title">Method Details</title>\n'%())
-                for m in i.methods:
-                    self.print_method(i, m)
-                self.out.write('</refsect1>\n'%())
-
-            if len(i.signals) > 0:
-                self.out.write('<refsect1 role="details" id="gdbus-signals-%s">\n'%(i.name))
-                self.out.write('  <title role="details.title">Signal Details</title>\n'%())
-                for s in i.signals:
-                    self.print_signal(i, s)
-                self.out.write('</refsect1>\n'%())
-
-            if len(i.properties) > 0:
-                self.out.write('<refsect1 role="details" id="gdbus-properties-%s">\n'%(i.name))
-                self.out.write('  <title role="details.title">Property Details</title>\n'%())
-                for s in i.properties:
-                    self.print_property(i, s)
-                self.out.write('</refsect1>\n'%())
-
-            self.out.write('</refentry>\n')
-            self.out.write('\n')
-
diff --git a/gio/gdbus-codegen/codegen_main.py b/gio/gdbus-codegen/codegen_main.py
deleted file mode 100755
index cc9298f..0000000
--- a/gio/gdbus-codegen/codegen_main.py
+++ /dev/null
@@ -1,200 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import sys
-import optparse
-
-import config
-import utils
-import dbustypes
-import parser
-import codegen
-import codegen_docbook
-
-def find_arg(arg_list, arg_name):
-    for a in arg_list:
-        if a.name == arg_name:
-            return a
-    return None
-
-def find_method(iface, method):
-    for m in iface.methods:
-        if m.name == method:
-            return m
-    return None
-
-def find_signal(iface, signal):
-    for m in iface.signals:
-        if m.name == signal:
-            return m
-    return None
-
-def find_prop(iface, prop):
-    for m in iface.properties:
-        if m.name == prop:
-            return m
-    return None
-
-def apply_annotation(iface_list, iface, method, signal, prop, arg, key, value):
-    for i in iface_list:
-        if i.name == iface:
-            iface_obj = i
-            break
-
-    if iface_obj == None:
-        raise RuntimeError('No interface %s'%iface)
-
-    target_obj = None
-
-    if method:
-        method_obj = find_method(iface_obj, method)
-        if method_obj == None:
-            raise RuntimeError('No method %s on interface %s'%(method, iface))
-        if arg:
-            arg_obj = find_arg(method_obj.in_args, arg)
-            if (arg_obj == None):
-                arg_obj = find_arg(method_obj.out_args, arg)
-                if (arg_obj == None):
-                    raise RuntimeError('No arg %s on method %s on interface %s'%(arg, method, iface))
-            target_obj = arg_obj
-        else:
-            target_obj = method_obj
-    elif signal:
-        signal_obj = find_signal(iface_obj, signal)
-        if signal_obj == None:
-            raise RuntimeError('No signal %s on interface %s'%(signal, iface))
-        if arg:
-            arg_obj = find_arg(signal_obj.args, arg)
-            if (arg_obj == None):
-                raise RuntimeError('No arg %s on signal %s on interface %s'%(arg, signal, iface))
-            target_obj = arg_obj
-        else:
-            target_obj = signal_obj
-    elif prop:
-        prop_obj = find_prop(iface_obj, prop)
-        if prop_obj == None:
-            raise RuntimeError('No property %s on interface %s'%(prop, iface))
-        target_obj = prop_obj
-    else:
-        target_obj = iface_obj
-    target_obj.annotations.insert(0, dbustypes.Annotation(key, value))
-
-
-def apply_annotations(iface_list, annotation_list):
-    # apply annotations given on the command line
-    for (what, key, value) in annotation_list:
-        pos = what.find('::')
-        if pos != -1:
-            # signal
-            iface = what[0:pos];
-            signal = what[pos + 2:]
-            pos = signal.find('[')
-            if pos != -1:
-                arg = signal[pos + 1:]
-                signal = signal[0:pos]
-                pos = arg.find(']')
-                arg = arg[0:pos]
-                apply_annotation(iface_list, iface, None, signal, None, arg, key, value)
-            else:
-                apply_annotation(iface_list, iface, None, signal, None, None, key, value)
-        else:
-            pos = what.find(':')
-            if pos != -1:
-                # property
-                iface = what[0:pos];
-                prop = what[pos + 1:]
-                apply_annotation(iface_list, iface, None, None, prop, None, key, value)
-            else:
-                pos = what.find('()')
-                if pos != -1:
-                    # method
-                    combined = what[0:pos]
-                    pos = combined.rfind('.')
-                    iface = combined[0:pos]
-                    method = combined[pos + 1:]
-                    pos = what.find('[')
-                    if pos != -1:
-                        arg = what[pos + 1:]
-                        pos = arg.find(']')
-                        arg = arg[0:pos]
-                        apply_annotation(iface_list, iface, method, None, None, arg, key, value)
-                    else:
-                        apply_annotation(iface_list, iface, method, None, None, None, key, value)
-                else:
-                    # must be an interface
-                    iface = what
-                    apply_annotation(iface_list, iface, None, None, None, None, key, value)
-
-def codegen_main():
-    arg_parser = optparse.OptionParser('%prog [options]')
-    arg_parser.add_option('', '--xml-files', metavar='FILE', action='append',
-                          help='D-Bus introspection XML file')
-    arg_parser.add_option('', '--interface-prefix', metavar='PREFIX', default='',
-                            help='String to strip from D-Bus interface names for code and docs')
-    arg_parser.add_option('', '--c-namespace', metavar='NAMESPACE', default='',
-                            help='The namespace to use for generated C code')
-    arg_parser.add_option('', '--c-generate-object-manager', action='store_true',
-                            help='Generate a GDBusObjectManagerClient subclass when generating C code')
-    arg_parser.add_option('', '--generate-c-code', metavar='OUTFILES',
-                          help='Generate C code in OUTFILES.[ch]')
-    arg_parser.add_option('', '--generate-docbook', metavar='OUTFILES',
-                          help='Generate Docbook in OUTFILES-org.Project.IFace.xml')
-    arg_parser.add_option('', '--annotate', nargs=3, action='append', metavar='WHAT KEY VALUE',
-                          help='Add annotation (may be used several times)')
-    (opts, args) = arg_parser.parse_args();
-
-    all_ifaces = []
-    for fname in args:
-        f = open(fname)
-        xml_data = f.read()
-        f.close()
-        parsed_ifaces = parser.parse_dbus_xml(xml_data)
-        all_ifaces.extend(parsed_ifaces)
-
-    if opts.annotate != None:
-        apply_annotations(all_ifaces, opts.annotate)
-
-    for i in parsed_ifaces:
-        i.post_process(opts.interface_prefix, opts.c_namespace)
-
-    docbook = opts.generate_docbook
-    docbook_gen = codegen_docbook.DocbookCodeGenerator(all_ifaces, docbook);
-    if docbook:
-        ret = docbook_gen.generate()
-
-    c_code = opts.generate_c_code
-    if c_code:
-        h = file(c_code + '.h', 'w')
-        c = file(c_code + '.c', 'w')
-        gen = codegen.CodeGenerator(all_ifaces,
-                                    opts.c_namespace,
-                                    opts.interface_prefix,
-                                    opts.c_generate_object_manager,
-                                    docbook_gen,
-                                    h, c);
-        ret = gen.generate()
-
-    sys.exit(0)
-
-if __name__ == "__main__":
-    codegen_main()
diff --git a/gio/gdbus-codegen/config.py.in b/gio/gdbus-codegen/config.py.in
deleted file mode 100644
index ee1a308..0000000
--- a/gio/gdbus-codegen/config.py.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-DATADIR = "@datarootdir@"
-DATADIR = DATADIR.replace(
-    "${prefix}", "@prefix@")
-VERSION = "@VERSION@"
diff --git a/gio/gdbus-codegen/dbustypes.py b/gio/gdbus-codegen/dbustypes.py
deleted file mode 100644
index 3a39f13..0000000
--- a/gio/gdbus-codegen/dbustypes.py
+++ /dev/null
@@ -1,364 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import utils
-
-class Annotation:
-    def __init__(self, key, value):
-        self.key = key
-        self.value = value
-        self.annotations = []
-
-class Arg:
-    def __init__(self, name, signature):
-        self.name = name
-        self.signature = signature
-        self.annotations = []
-        self.doc_string = ''
-        self.since = ''
-
-    def post_process(self, interface_prefix, c_namespace, arg_number):
-        if len(self.doc_string) == 0:
-            self.doc_string = utils.lookup_docs(self.annotations)
-        if len(self.since) == 0:
-            self.since = utils.lookup_since(self.annotations)
-
-        if self.name == None:
-            self.name = 'unnamed_arg%d'%arg_number
-        # default to GVariant
-        self.ctype_in_g  = 'GVariant *'
-        self.ctype_in  = 'GVariant *'
-        self.ctype_out = 'GVariant **'
-        self.gtype = 'G_TYPE_VARIANT'
-        self.free_func = 'g_variant_unref'
-        self.format_in = '@' + self.signature
-        self.format_out = '@' + self.signature
-        if not utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
-            if self.signature == 'b':
-                self.ctype_in_g  = 'gboolean '
-                self.ctype_in  = 'gboolean '
-                self.ctype_out = 'gboolean *'
-                self.gtype = 'G_TYPE_BOOLEAN'
-                self.free_func = None
-                self.format_in = 'b'
-                self.format_out = 'b'
-            elif self.signature == 'y':
-                self.ctype_in_g  = 'guchar '
-                self.ctype_in  = 'guchar '
-                self.ctype_out = 'guchar *'
-                self.gtype = 'G_TYPE_UCHAR'
-                self.free_func = None
-                self.format_in = 'y'
-                self.format_out = 'y'
-            elif self.signature == 'n':
-                self.ctype_in_g  = 'gint '
-                self.ctype_in  = 'gint16 '
-                self.ctype_out = 'gint16 *'
-                self.gtype = 'G_TYPE_INT'
-                self.free_func = None
-                self.format_in = 'n'
-                self.format_out = 'n'
-            elif self.signature == 'q':
-                self.ctype_in_g  = 'guint '
-                self.ctype_in  = 'guint16 '
-                self.ctype_out = 'guint16 *'
-                self.gtype = 'G_TYPE_UINT'
-                self.free_func = None
-                self.format_in = 'q'
-                self.format_out = 'q'
-            elif self.signature == 'i':
-                self.ctype_in_g  = 'gint '
-                self.ctype_in  = 'gint '
-                self.ctype_out = 'gint *'
-                self.gtype = 'G_TYPE_INT'
-                self.free_func = None
-                self.format_in = 'i'
-                self.format_out = 'i'
-            elif self.signature == 'u':
-                self.ctype_in_g  = 'guint '
-                self.ctype_in  = 'guint '
-                self.ctype_out = 'guint *'
-                self.gtype = 'G_TYPE_UINT'
-                self.free_func = None
-                self.format_in = 'u'
-                self.format_out = 'u'
-            elif self.signature == 'x':
-                self.ctype_in_g  = 'gint64 '
-                self.ctype_in  = 'gint64 '
-                self.ctype_out = 'gint64 *'
-                self.gtype = 'G_TYPE_INT64'
-                self.free_func = None
-                self.format_in = 'x'
-                self.format_out = 'x'
-            elif self.signature == 't':
-                self.ctype_in_g  = 'guint64 '
-                self.ctype_in  = 'guint64 '
-                self.ctype_out = 'guint64 *'
-                self.gtype = 'G_TYPE_UINT64'
-                self.free_func = None
-                self.format_in = 't'
-                self.format_out = 't'
-            elif self.signature == 'd':
-                self.ctype_in_g  = 'gdouble '
-                self.ctype_in  = 'gdouble '
-                self.ctype_out = 'gdouble *'
-                self.gtype = 'G_TYPE_DOUBLE'
-                self.free_func = None
-                self.format_in = 'd'
-                self.format_out = 'd'
-            elif self.signature == 's':
-                self.ctype_in_g  = 'const gchar *'
-                self.ctype_in  = 'const gchar *'
-                self.ctype_out = 'gchar **'
-                self.gtype = 'G_TYPE_STRING'
-                self.free_func = 'g_free'
-                self.format_in = 's'
-                self.format_out = 's'
-            elif self.signature == 'o':
-                self.ctype_in_g  = 'const gchar *'
-                self.ctype_in  = 'const gchar *'
-                self.ctype_out = 'gchar **'
-                self.gtype = 'G_TYPE_STRING'
-                self.free_func = 'g_free'
-                self.format_in = 'o'
-                self.format_out = 'o'
-            elif self.signature == 'g':
-                self.ctype_in_g  = 'const gchar *'
-                self.ctype_in  = 'const gchar *'
-                self.ctype_out = 'gchar **'
-                self.gtype = 'G_TYPE_STRING'
-                self.free_func = 'g_free'
-                self.format_in = 'g'
-                self.format_out = 'g'
-            elif self.signature == 'ay':
-                self.ctype_in_g  = 'const gchar *'
-                self.ctype_in  = 'const gchar *'
-                self.ctype_out = 'gchar **'
-                self.gtype = 'G_TYPE_STRING'
-                self.free_func = 'g_free'
-                self.format_in = '^ay'
-                self.format_out = '^ay'
-            elif self.signature == 'as':
-                self.ctype_in_g  = 'const gchar *const *'
-                self.ctype_in  = 'const gchar *const *'
-                self.ctype_out = 'gchar ***'
-                self.gtype = 'G_TYPE_STRV'
-                self.free_func = 'g_strfreev'
-                self.format_in = '^as'
-                self.format_out = '^as'
-            elif self.signature == 'aay':
-                self.ctype_in_g  = 'const gchar *const *'
-                self.ctype_in  = 'const gchar *const *'
-                self.ctype_out = 'gchar ***'
-                self.gtype = 'G_TYPE_STRV'
-                self.free_func = 'g_strfreev'
-                self.format_in = '^aay'
-                self.format_out = '^aay'
-
-class Method:
-    def __init__(self, name):
-        self.name = name
-        self.in_args = []
-        self.out_args = []
-        self.annotations = []
-        self.doc_string = ''
-        self.since = ''
-        self.deprecated = False
-
-    def post_process(self, interface_prefix, c_namespace):
-        if len(self.doc_string) == 0:
-            self.doc_string = utils.lookup_docs(self.annotations)
-        if len(self.since) == 0:
-            self.since = utils.lookup_since(self.annotations)
-
-        name = self.name
-        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
-        if utils.is_ugly_case(overridden_name):
-            self.name_lower = overridden_name.lower()
-        else:
-            if overridden_name:
-                name = overridden_name
-            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
-        self.name_hyphen = self.name_lower.replace('_', '-')
-
-        arg_count = 0
-        for a in self.in_args:
-            a.post_process(interface_prefix, c_namespace, arg_count)
-            arg_count += 1
-
-        for a in self.out_args:
-            a.post_process(interface_prefix, c_namespace, arg_count)
-            arg_count += 1
-
-        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
-            self.deprecated = True
-
-class Signal:
-    def __init__(self, name):
-        self.name = name
-        self.args = []
-        self.annotations = []
-        self.doc_string = ''
-        self.since = ''
-        self.deprecated = False
-
-    def post_process(self, interface_prefix, c_namespace):
-        if len(self.doc_string) == 0:
-            self.doc_string = utils.lookup_docs(self.annotations)
-        if len(self.since) == 0:
-            self.since = utils.lookup_since(self.annotations)
-
-        name = self.name
-        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
-        if utils.is_ugly_case(overridden_name):
-            self.name_lower = overridden_name.lower()
-        else:
-            if overridden_name:
-                name = overridden_name
-            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
-        self.name_hyphen = self.name_lower.replace('_', '-')
-
-        arg_count = 0
-        for a in self.args:
-            a.post_process(interface_prefix, c_namespace, arg_count)
-            arg_count += 1
-
-        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
-            self.deprecated = True
-
-class Property:
-    def __init__(self, name, signature, access):
-        self.name = name
-        self.signature = signature
-        self.access = access
-        self.annotations = []
-        self.arg = Arg('value', self.signature)
-        self.arg.annotations = self.annotations
-        self.readable = False
-        self.writable = False
-        if self.access == 'readwrite':
-            self.readable = True
-            self.writable = True
-        elif self.access == 'read':
-            self.readable = True
-        elif self.access == 'write':
-            self.writable = True
-        else:
-            raise RuntimeError('Invalid access type %s'%self.access)
-        self.doc_string = ''
-        self.since = ''
-        self.deprecated = False
-
-    def post_process(self, interface_prefix, c_namespace):
-        if len(self.doc_string) == 0:
-            self.doc_string = utils.lookup_docs(self.annotations)
-        if len(self.since) == 0:
-            self.since = utils.lookup_since(self.annotations)
-
-        name = self.name
-        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
-        if utils.is_ugly_case(overridden_name):
-            self.name_lower = overridden_name.lower()
-        else:
-            if overridden_name:
-                name = overridden_name
-            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
-        if self.name_lower == 'type':
-            self.name_lower = 'type_'
-        self.name_hyphen = self.name_lower.replace('_', '-')
-
-        # recalculate arg
-        self.arg.annotations = self.annotations
-        self.arg.post_process(interface_prefix, c_namespace, 0)
-
-        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
-            self.deprecated = True
-
-class Interface:
-    def __init__(self, name):
-        self.name = name
-        self.methods = []
-        self.signals = []
-        self.properties = []
-        self.annotations = []
-        self.doc_string = ''
-        self.doc_string_brief = ''
-        self.since = ''
-        self.deprecated = False
-
-    def post_process(self, interface_prefix, c_namespace):
-        if len(self.doc_string) == 0:
-            self.doc_string = utils.lookup_docs(self.annotations)
-        if len(self.doc_string_brief) == 0:
-            self.doc_string_brief = utils.lookup_brief_docs(self.annotations)
-        if len(self.since) == 0:
-            self.since = utils.lookup_since(self.annotations)
-
-        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
-        if utils.is_ugly_case(overridden_name):
-            name = overridden_name.replace('_', '')
-            name_with_ns = c_namespace + name
-            self.name_without_prefix = name
-            self.camel_name = name_with_ns
-            if len(c_namespace) > 0:
-                self.ns_upper = utils.camel_case_to_uscore(c_namespace).upper() + '_'
-                self.name_lower = utils.camel_case_to_uscore(c_namespace) + '_' + overridden_name.lower()
-            else:
-                self.ns_upper = ''
-                self.name_lower = overridden_name.lower()
-            self.name_upper = overridden_name.upper()
-
-            #raise RuntimeError('handle Ugly_Case ', overridden_name)
-        else:
-            if overridden_name:
-                name = overridden_name
-            else:
-                name = self.name
-                if name.startswith(interface_prefix):
-                    name = name[len(interface_prefix):]
-            self.name_without_prefix = name
-            name = utils.strip_dots(name)
-            name_with_ns = utils.strip_dots(c_namespace + '.' + name)
-
-            self.camel_name = name_with_ns
-            if len(c_namespace) > 0:
-                self.ns_upper = utils.camel_case_to_uscore(c_namespace).upper() + '_'
-                self.name_lower = utils.camel_case_to_uscore(c_namespace) + '_' + utils.camel_case_to_uscore(name)
-            else:
-                self.ns_upper = ''
-                self.name_lower = utils.camel_case_to_uscore(name_with_ns)
-            self.name_upper = utils.camel_case_to_uscore(name).upper()
-
-        self.name_hyphen = self.name_upper.lower().replace('_', '-')
-
-        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
-            self.deprecated = True
-
-        for m in self.methods:
-            m.post_process(interface_prefix, c_namespace)
-
-        for s in self.signals:
-            s.post_process(interface_prefix, c_namespace)
-
-        for p in self.properties:
-            p.post_process(interface_prefix, c_namespace)
diff --git a/gio/gdbus-codegen/gdbus-codegen.in b/gio/gdbus-codegen/gdbus-codegen.in
deleted file mode 100755
index 0fbacb3..0000000
--- a/gio/gdbus-codegen/gdbus-codegen.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/python
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-
-import os
-import sys
-
-path = os.path.join('@libdir@', 'gdbus-codegen')
-sys.path.insert(0, path)
-
-from codegen_main import codegen_main
-
-sys.exit(codegen_main())
diff --git a/gio/gdbus-codegen/parser.py b/gio/gdbus-codegen/parser.py
deleted file mode 100644
index a324006..0000000
--- a/gio/gdbus-codegen/parser.py
+++ /dev/null
@@ -1,290 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import dbustypes
-
-import sys
-import xml.parsers.expat
-
-class DBusXMLParser:
-    STATE_TOP = 'top'
-    STATE_NODE = 'node'
-    STATE_INTERFACE = 'interface'
-    STATE_METHOD = 'method'
-    STATE_SIGNAL = 'signal'
-    STATE_PROPERTY = 'property'
-    STATE_ARG = 'arg'
-    STATE_ANNOTATION = 'annotation'
-    STATE_IGNORED = 'ignored'
-
-    def __init__(self, xml_data):
-        self._parser = xml.parsers.expat.ParserCreate()
-        self._parser.CommentHandler = self.handle_comment
-        self._parser.CharacterDataHandler = self.handle_char_data
-        self._parser.StartElementHandler = self.handle_start_element
-        self._parser.EndElementHandler = self.handle_end_element
-
-        self.parsed_interfaces = []
-        self._cur_object = None
-
-        self.state = DBusXMLParser.STATE_TOP
-        self.state_stack = []
-        self._cur_object = None
-        self._cur_object_stack = []
-
-        self.doc_comment_last_symbol = ''
-
-        self._parser.Parse(xml_data)
-
-    COMMENT_STATE_BEGIN = 'begin'
-    COMMENT_STATE_PARAMS = 'params'
-    COMMENT_STATE_BODY = 'body'
-    COMMENT_STATE_SKIP = 'skip'
-    def handle_comment(self, data):
-        comment_state = DBusXMLParser.COMMENT_STATE_BEGIN;
-        lines = data.split('\n')
-        symbol = ''
-        body = ''
-        in_para = False
-        params = {}
-        for line in lines:
-            orig_line = line
-            line = line.lstrip()
-            if comment_state == DBusXMLParser.COMMENT_STATE_BEGIN:
-                if len(line) > 0:
-                    colon_index = line.find(': ')
-                    if colon_index == -1:
-                        if line.endswith(':'):
-                            symbol = line[0:len(line)-1]
-                            comment_state = DBusXMLParser.COMMENT_STATE_PARAMS
-                        else:
-                            comment_state = DBusXMLParser.COMMENT_STATE_SKIP
-                    else:
-                        symbol = line[0:colon_index]
-                        rest_of_line = line[colon_index+2:].strip()
-                        if len(rest_of_line) > 0:
-                            body += '<para>' + rest_of_line + '</para>'
-                        comment_state = DBusXMLParser.COMMENT_STATE_PARAMS
-            elif comment_state == DBusXMLParser.COMMENT_STATE_PARAMS:
-                if line.startswith('@'):
-                    colon_index = line.find(': ')
-                    if colon_index == -1:
-                        comment_state = DBusXMLParser.COMMENT_STATE_BODY
-                        if not in_para:
-                            body += '<para>'
-                            in_para = True
-                        body += orig_line + '\n'
-                    else:
-                        param = line[1:colon_index]
-                        docs = line[colon_index + 2:]
-                        params[param] = docs
-                else:
-                    comment_state = DBusXMLParser.COMMENT_STATE_BODY
-                    if len(line) > 0:
-                        if not in_para:
-                            body += '<para>'
-                            in_para = True
-                        body += orig_line + '\n'
-            elif comment_state == DBusXMLParser.COMMENT_STATE_BODY:
-                if len(line) > 0:
-                    if not in_para:
-                        body += '<para>'
-                        in_para = True
-                    body += orig_line + '\n'
-                else:
-                    if in_para:
-                        body += '</para>'
-                        in_para = False
-        if in_para:
-            body += '</para>'
-
-        if symbol != '':
-            self.doc_comment_last_symbol = symbol
-            self.doc_comment_params = params
-            self.doc_comment_body = body
-
-    def handle_char_data(self, data):
-        #print 'char_data=%s'%data
-        pass
-
-    def handle_start_element(self, name, attrs):
-        old_state = self.state
-        old_cur_object = self._cur_object
-        if self.state == DBusXMLParser.STATE_IGNORED:
-            self.state = DBusXMLParser.STATE_IGNORED
-        elif self.state == DBusXMLParser.STATE_TOP:
-            if name == DBusXMLParser.STATE_NODE:
-                self.state = DBusXMLParser.STATE_NODE
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-        elif self.state == DBusXMLParser.STATE_NODE:
-            if name == DBusXMLParser.STATE_INTERFACE:
-                self.state = DBusXMLParser.STATE_INTERFACE
-                iface = dbustypes.Interface(attrs['name'])
-                self._cur_object = iface
-                self.parsed_interfaces.append(iface)
-            elif name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-            # assign docs, if any
-            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-                self._cur_object.doc_string = self.doc_comment_body
-                if self.doc_comment_params.has_key('short_description'):
-                    short_description = self.doc_comment_params['short_description']
-                    self._cur_object.doc_string_brief = short_description
-                if self.doc_comment_params.has_key('since'):
-                    self._cur_object.since = self.doc_comment_params['since']
-
-        elif self.state == DBusXMLParser.STATE_INTERFACE:
-            if name == DBusXMLParser.STATE_METHOD:
-                self.state = DBusXMLParser.STATE_METHOD
-                method = dbustypes.Method(attrs['name'])
-                self._cur_object.methods.append(method)
-                self._cur_object = method
-            elif name == DBusXMLParser.STATE_SIGNAL:
-                self.state = DBusXMLParser.STATE_SIGNAL
-                signal = dbustypes.Signal(attrs['name'])
-                self._cur_object.signals.append(signal)
-                self._cur_object = signal
-            elif name == DBusXMLParser.STATE_PROPERTY:
-                self.state = DBusXMLParser.STATE_PROPERTY
-                prop = dbustypes.Property(attrs['name'], attrs['type'], attrs['access'])
-                self._cur_object.properties.append(prop)
-                self._cur_object = prop
-            elif name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-            # assign docs, if any
-            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-                self._cur_object.doc_string = self.doc_comment_body
-                if self.doc_comment_params.has_key('since'):
-                    self._cur_object.since = self.doc_comment_params['since']
-
-        elif self.state == DBusXMLParser.STATE_METHOD:
-            if name == DBusXMLParser.STATE_ARG:
-                self.state = DBusXMLParser.STATE_ARG
-                arg_name = None
-                if attrs.has_key('name'):
-                    arg_name = attrs['name']
-                arg = dbustypes.Arg(arg_name, attrs['type'])
-                direction = attrs['direction']
-                if direction == 'in':
-                    self._cur_object.in_args.append(arg)
-                elif direction == 'out':
-                    self._cur_object.out_args.append(arg)
-                else:
-                    raise RuntimeError('Invalid direction "%s"'%(direction))
-                self._cur_object = arg
-            elif name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-            # assign docs, if any
-            if self.doc_comment_last_symbol == old_cur_object.name:
-                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-                    doc_string = self.doc_comment_params[attrs['name']]
-                    if doc_string != None:
-                        self._cur_object.doc_string = doc_string
-                    if self.doc_comment_params.has_key('since'):
-                        self._cur_object.since = self.doc_comment_params['since']
-
-        elif self.state == DBusXMLParser.STATE_SIGNAL:
-            if name == DBusXMLParser.STATE_ARG:
-                self.state = DBusXMLParser.STATE_ARG
-                arg_name = None
-                if attrs.has_key('name'):
-                    arg_name = attrs['name']
-                arg = dbustypes.Arg(arg_name, attrs['type'])
-                self._cur_object.args.append(arg)
-                self._cur_object = arg
-            elif name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-            # assign docs, if any
-            if self.doc_comment_last_symbol == old_cur_object.name:
-                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-                    doc_string = self.doc_comment_params[attrs['name']]
-                    if doc_string != None:
-                        self._cur_object.doc_string = doc_string
-                    if self.doc_comment_params.has_key('since'):
-                        self._cur_object.since = self.doc_comment_params['since']
-
-        elif self.state == DBusXMLParser.STATE_PROPERTY:
-            if name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-        elif self.state == DBusXMLParser.STATE_ARG:
-            if name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-        elif self.state == DBusXMLParser.STATE_ANNOTATION:
-            if name == DBusXMLParser.STATE_ANNOTATION:
-                self.state = DBusXMLParser.STATE_ANNOTATION
-                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
-                self._cur_object.annotations.append(anno)
-                self._cur_object = anno
-            else:
-                self.state = DBusXMLParser.STATE_IGNORED
-
-        else:
-            raise RuntimeError('Unhandled state "%s" while entering element with name "%s"'%(self.state, name))
-
-        self.state_stack.append(old_state)
-        self._cur_object_stack.append(old_cur_object)
-
-    def handle_end_element(self, name):
-        self.state = self.state_stack.pop()
-        self._cur_object = self._cur_object_stack.pop()
-
-def parse_dbus_xml(xml_data):
-    parser = DBusXMLParser(xml_data)
-    return parser.parsed_interfaces
diff --git a/gio/gdbus-codegen/utils.py b/gio/gdbus-codegen/utils.py
deleted file mode 100644
index 687b979..0000000
--- a/gio/gdbus-codegen/utils.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- Mode: Python -*-
-
-# GDBus - GLib D-Bus Library
-#
-# Copyright (C) 2008-2011 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.
-#
-# Author: David Zeuthen <davidz@redhat.com>
-
-import distutils.version
-
-def strip_dots(s):
-    ret = ''
-    force_upper = False
-    for c in s:
-        if c == '.':
-            force_upper = True
-        else:
-            if force_upper:
-                ret += c.upper()
-                force_upper = False
-            else:
-                ret += c
-    return ret
-
-def dots_to_hyphens(s):
-    return s.replace('.', '-')
-
-def camel_case_to_uscore(s):
-    ret = ''
-    insert_uscore = False
-    prev_was_lower = False
-    for c in s:
-        if c.isupper():
-            if prev_was_lower:
-                insert_uscore = True
-            prev_was_lower = False
-        else:
-            prev_was_lower = True
-        if insert_uscore:
-            ret += '_'
-        ret += c.lower()
-        insert_uscore = False
-    return ret
-
-def is_ugly_case(s):
-    if s and s.find('_') > 0:
-        return True
-    return False
-
-def lookup_annotation(annotations, key):
-    if annotations:
-        for a in annotations:
-            if a.key == key:
-                return a.value
-    return None
-
-def lookup_docs(annotations):
-    s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString')
-    if s == None:
-        return ''
-    else:
-        return s
-
-def lookup_since(annotations):
-    s = lookup_annotation(annotations, 'org.gtk.GDBus.Since')
-    if s == None:
-        return ''
-    else:
-        return s
-
-def lookup_brief_docs(annotations):
-    s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString.Short')
-    if s == None:
-        return ''
-    else:
-        return s
-
-# I'm sure this could be a lot more elegant if I was
-# more fluent in python...
-def my_version_cmp(a, b):
-    if len(a[0]) > 0 and len(b[0]) > 0:
-        va = distutils.version.LooseVersion(a[0])
-        vb = distutils.version.LooseVersion(b[0])
-        ret = va.__cmp__(vb)
-    else:
-        ret = cmp(a[0], b[0])
-    if ret != 0:
-        return ret
-    return cmp(a[1], b[1])
diff --git a/gio/gdbus/codegen/.gitignore b/gio/gdbus/codegen/.gitignore
new file mode 100644
index 0000000..2d1abb9
--- /dev/null
+++ b/gio/gdbus/codegen/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+gdbus-codegen
diff --git a/gio/gdbus/codegen/Makefile.am b/gio/gdbus/codegen/Makefile.am
new file mode 100644
index 0000000..be658b0
--- /dev/null
+++ b/gio/gdbus/codegen/Makefile.am
@@ -0,0 +1,30 @@
+
+NULL =
+bin_SCRIPTS =
+CLEANFILES =
+EXTRA_DIST =
+
+codegendir = $(libdir)/gdbus/codegen
+codegen_PYTHON =						\
+	__init__.py						\
+	codegen.py						\
+	codegen_main.py						\
+	codegen_docbook.py					\
+	config.py						\
+	dbustypes.py						\
+	parser.py						\
+	utils.py						\
+	$(NULL)
+
+CLEANFILES += config.pyc
+
+bin_SCRIPTS += gdbus-codegen
+CLEANFILES += gdbus-codegen
+EXTRA_DIST += gdbus-codegen.in
+
+gdbus-codegen: gdbus-codegen.in Makefile
+	$(AM_V_GEN) sed -e 's,@libdir\@,$(libdir),' -e 's,@PYTHON\@,$(PYTHON),' $< > $@.tmp && mv $@.tmp $@
+	@chmod a+x $@
+
+clean-local:
+	rm -f *~
diff --git a/gio/gdbus/codegen/__init__.py b/gio/gdbus/codegen/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gio/gdbus/codegen/codegen.py b/gio/gdbus/codegen/codegen.py
new file mode 100644
index 0000000..2285074
--- /dev/null
+++ b/gio/gdbus/codegen/codegen.py
@@ -0,0 +1,3107 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+import sys
+
+import config
+from . import utils
+from . import dbustypes
+
+# ----------------------------------------------------------------------------------------------------
+
+class CodeGenerator:
+    def __init__(self, ifaces, namespace, interface_prefix, generate_objmanager, docbook_gen, h, c):
+        self.docbook_gen = docbook_gen
+        self.generate_objmanager = generate_objmanager
+        self.ifaces = ifaces
+        self.h = h
+        self.c = c
+        self.namespace = namespace
+        if len(namespace) > 1:
+            self.ns_upper = utils.camel_case_to_uscore(namespace).upper() + '_'
+            self.ns_lower = utils.camel_case_to_uscore(namespace).lower() + '_'
+        else:
+            self.ns_upper = ''
+            self.ns_lower = ''
+        self.interface_prefix = interface_prefix
+        self.header_guard = self.h.name.upper().replace('.', '_').replace('-', '_')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_intro(self):
+        self.c.write('/*\n'
+                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
+                     ' *\n'
+                     ' * The license of this code is the same as for the source it was derived from.\n'
+                     ' */\n'
+                     '\n'
+                     %(config.VERSION))
+        self.c.write('#ifdef HAVE_CONFIG_H\n'
+                     '#  include "config.h"\n'
+                     '#endif\n'
+                     '\n'
+                     '#include "%s"\n'
+                     '\n'%(self.h.name))
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  GDBusArgInfo parent_struct;\n'
+                     '  gboolean use_gvariant;\n'
+                     '} _ExtendedGDBusArgInfo;\n'
+                     '\n')
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  GDBusMethodInfo parent_struct;\n'
+                     '  const gchar *signal_name;\n'
+                     '} _ExtendedGDBusMethodInfo;\n'
+                     '\n')
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  GDBusSignalInfo parent_struct;\n'
+                     '  const gchar *signal_name;\n'
+                     '} _ExtendedGDBusSignalInfo;\n'
+                     '\n')
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  GDBusPropertyInfo parent_struct;\n'
+                     '  const gchar *hyphen_name;\n'
+                     '  gboolean use_gvariant;\n'
+                     '} _ExtendedGDBusPropertyInfo;\n'
+                     '\n')
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  GDBusInterfaceInfo parent_struct;\n'
+                     '  const gchar *hyphen_name;\n'
+                     '} _ExtendedGDBusInterfaceInfo;\n'
+                     '\n')
+
+        self.c.write('typedef struct\n'
+                     '{\n'
+                     '  const _ExtendedGDBusPropertyInfo *info;\n'
+                     '  guint prop_id;\n'
+                     '  GValue orig_value; /* the value before the change */\n'
+                     '} ChangedProperty;\n'
+                     '\n'
+                     'static void\n'
+                     '_changed_property_free (ChangedProperty *data)\n'
+                     '{\n'
+                     '  g_value_unset (&data->orig_value);\n'
+                     '  g_free (data);\n'
+                     '}\n'
+                     '\n')
+
+        self.c.write('static gboolean\n'
+                     '_g_strv_equal0 (gchar **a, gchar **b)\n'
+                     '{\n'
+                     '  gboolean ret = FALSE;\n'
+                     '  guint n;\n'
+                     '  if (a == NULL && b == NULL)\n'
+                     '    {\n'
+                     '      ret = TRUE;\n'
+                     '      goto out;\n'
+                     '    }\n'
+                     '  if (a == NULL || b == NULL)\n'
+                     '    goto out;\n'
+                     '  if (g_strv_length (a) != g_strv_length (b))\n'
+                     '    goto out;\n'
+                     '  for (n = 0; a[n] != NULL; n++)\n'
+                     '    if (g_strcmp0 (a[n], b[n]) != 0)\n'
+                     '      goto out;\n'
+                     '  ret = TRUE;\n'
+                     'out:\n'
+                     '  return ret;\n'
+                     '}\n'
+                     '\n')
+
+        self.c.write('static gboolean\n'
+                     '_g_variant_equal0 (GVariant *a, GVariant *b)\n'
+                     '{\n'
+                     '  gboolean ret = FALSE;\n'
+                     '  if (a == NULL && b == NULL)\n'
+                     '    {\n'
+                     '      ret = TRUE;\n'
+                     '      goto out;\n'
+                     '    }\n'
+                     '  if (a == NULL || b == NULL)\n'
+                     '    goto out;\n'
+                     '  ret = g_variant_equal (a, b);\n'
+                     'out:\n'
+                     '  return ret;\n'
+                     '}\n'
+                     '\n')
+
+        # simplified - only supports the types we use
+        self.c.write('G_GNUC_UNUSED static gboolean\n'
+                     '_g_value_equal (const GValue *a, const GValue *b)\n'
+                     '{\n'
+                     '  gboolean ret = FALSE;\n'
+                     '  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));\n'
+                     '  switch (G_VALUE_TYPE (a))\n'
+                     '    {\n'
+                     '      case G_TYPE_BOOLEAN:\n'
+                     '        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_UCHAR:\n'
+                     '        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_INT:\n'
+                     '        ret = (g_value_get_int (a) == g_value_get_int (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_UINT:\n'
+                     '        ret = (g_value_get_uint (a) == g_value_get_uint (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_INT64:\n'
+                     '        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_UINT64:\n'
+                     '        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_DOUBLE:\n'
+                     '        ret = (g_value_get_double (a) == g_value_get_double (b));\n'
+                     '        break;\n'
+                     '      case G_TYPE_STRING:\n'
+                     '        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);\n'
+                     '        break;\n'
+                     '      case G_TYPE_VARIANT:\n'
+                     '        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));\n'
+                     '        break;\n'
+                     '      default:\n'
+                     '        if (G_VALUE_TYPE (a) == G_TYPE_STRV)\n'
+                     '          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));\n'
+                     '        else\n'
+                     '          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));\n'
+                     '        break;\n'
+                     '    }\n'
+                     '  return ret;\n'
+                     '}\n'
+                     '\n')
+
+        self.h.write('/*\n'
+                     ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
+                     ' *\n'
+                     ' * The license of this code is the same as for the source it was derived from.\n'
+                     ' */\n'
+                     '\n'
+                     '#ifndef __%s__\n'
+                     '#define __%s__\n'
+                     '\n'%(config.VERSION, self.header_guard, self.header_guard))
+        self.h.write('#include <gio/gio.h>\n'
+                     '\n'
+                     'G_BEGIN_DECLS\n'
+                     '\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def declare_types(self):
+        for i in self.ifaces:
+            self.h.write('\n')
+            self.h.write('/* ------------------------------------------------------------------------ */\n')
+            self.h.write('/* Declarations for %s */\n'%i.name)
+            self.h.write('\n')
+
+            # First the GInterface
+            self.h.write('#define %sTYPE_%s (%s_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
+            self.h.write('#define %s%s(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s, %s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %sIS_%s(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+            self.h.write('#define %s%s_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), %sTYPE_%s, %s))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('\n')
+            self.h.write('struct _%s;\n'%(i.camel_name))
+            self.h.write('typedef struct _%s %s;\n'%(i.camel_name, i.camel_name))
+            self.h.write('typedef struct _%sIface %sIface;\n'%(i.camel_name, i.camel_name))
+            self.h.write('\n')
+            self.h.write('struct _%sIface\n'%(i.camel_name))
+            self.h.write('{\n')
+            self.h.write('  GTypeInterface parent_iface;\n')
+
+            function_pointers = {}
+
+            if len(i.methods) > 0:
+                self.h.write('\n')
+                for m in i.methods:
+                    key = (m.since, '_method_%s'%m.name_lower)
+                    value  = '  gboolean (*handle_%s) (\n'%(m.name_lower)
+                    value += '    %s *object,\n'%(i.camel_name)
+                    value += '    GDBusMethodInvocation *invocation'%()
+                    for a in m.in_args:
+                        value += ',\n    %s%s'%(a.ctype_in, a.name)
+                    value += ');\n\n'
+                    function_pointers[key] = value
+
+            if len(i.signals) > 0:
+                self.h.write('\n')
+                for s in i.signals:
+                    key = (s.since, '_signal_%s'%s.name_lower)
+                    value  = '  void (*%s) (\n'%(s.name_lower)
+                    value += '    %s *object'%(i.camel_name)
+                    for a in s.args:
+                        value += ',\n    %s%s'%(a.ctype_in, a.name)
+                    value += ');\n\n'
+                    function_pointers[key] = value
+
+            # Sort according to @since tag, then name.. this ensures
+            # that the function pointers don't change order assuming
+            # judicious use of @since
+            #
+            # Also use a proper version comparison function so e.g.
+            # 10.0 comes after 2.0.
+            #
+            # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
+            # for discussion
+            keys = function_pointers.keys()
+            if len(keys) > 0:
+                keys.sort(cmp=utils.my_version_cmp)
+                for key in keys:
+                    self.h.write('%s'%function_pointers[key])
+
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %s_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
+            self.h.write('\n')
+            self.h.write('GDBusInterfaceInfo *%s_interface_info (void);\n'%(i.name_lower))
+            if len(i.properties) > 0:
+                self.h.write('guint %s_override_properties (GObjectClass *klass, guint property_id_begin);\n'%(i.name_lower))
+            self.h.write('\n')
+
+            # Then method call completion functions
+            if len(i.methods) > 0:
+                self.h.write('\n')
+                self.h.write('/* D-Bus method call completion functions: */\n')
+                for m in i.methods:
+                    if m.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('void %s_complete_%s (\n'
+                                 '    %s *object,\n'
+                                 '    GDBusMethodInvocation *invocation'%(i.name_lower, m.name_lower, i.camel_name))
+                    for a in m.out_args:
+                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
+                    self.h.write(');\n')
+                    self.h.write('\n')
+                self.h.write('\n')
+
+            # Then signal emission functions
+            if len(i.signals) > 0:
+                self.h.write('\n')
+                self.h.write('/* D-Bus signal emissions functions: */\n')
+                for s in i.signals:
+                    if s.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('void %s_emit_%s (\n'
+                                 '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
+                    for a in s.args:
+                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
+                    self.h.write(');\n')
+                    self.h.write('\n')
+                self.h.write('\n')
+
+            # Then method call declarations
+            if len(i.methods) > 0:
+                self.h.write('\n')
+                self.h.write('/* D-Bus method calls: */\n')
+                for m in i.methods:
+                    # async begin
+                    if m.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('void %s_call_%s (\n'
+                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+                    for a in m.in_args:
+                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
+                    self.h.write(',\n'
+                                 '    GCancellable *cancellable,\n'
+                                 '    GAsyncReadyCallback callback,\n'
+                                 '    gpointer user_data);\n')
+                    self.h.write('\n')
+                    # async finish
+                    if m.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('gboolean %s_call_%s_finish (\n'
+                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+                    for a in m.out_args:
+                        self.h.write(',\n    %sout_%s'%(a.ctype_out, a.name))
+                    self.h.write(',\n'
+                                 '    GAsyncResult *res,\n'
+                                 '    GError **error);\n')
+                    self.h.write('\n')
+                    # sync
+                    if m.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('gboolean %s_call_%s_sync (\n'
+                                 '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+                    for a in m.in_args:
+                        self.h.write(',\n    %s%s'%(a.ctype_in, a.name))
+                    for a in m.out_args:
+                        self.h.write(',\n    %sout_%s'%(a.ctype_out, a.name))
+                    self.h.write(',\n'
+                                 '    GCancellable *cancellable,\n'
+                                 '    GError **error);\n')
+                    self.h.write('\n')
+                self.h.write('\n')
+
+            # Then the property accessor declarations
+            if len(i.properties) > 0:
+                self.h.write('\n')
+                self.h.write('/* D-Bus property accessors: */\n')
+                for p in i.properties:
+                    # getter
+                    if p.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('%s%s_get_%s (%s *object);\n'%(p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name))
+                    # setter
+                    if p.deprecated:
+                        self.h.write('G_GNUC_DEPRECATED ')
+                    self.h.write('void %s_set_%s (%s *object, %svalue);\n'%(i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in, ))
+                    self.h.write('\n')
+
+            # Then the proxy
+            self.h.write('\n')
+            self.h.write('/* ---- */\n')
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_%s_PROXY (%s_proxy_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
+            self.h.write('#define %s%s_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s_PROXY, %sProxy))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %s%s_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_%s_PROXY, %sProxyClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %s%s_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_%s_PROXY, %sProxyClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %sIS_%s_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s_PROXY))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+            self.h.write('#define %sIS_%s_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_%s_PROXY))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+            self.h.write('\n')
+            self.h.write('typedef struct _%sProxy %sProxy;\n'%(i.camel_name, i.camel_name))
+            self.h.write('typedef struct _%sProxyClass %sProxyClass;\n'%(i.camel_name, i.camel_name))
+            self.h.write('typedef struct _%sProxyPrivate %sProxyPrivate;\n'%(i.camel_name, i.camel_name))
+            self.h.write('\n')
+            self.h.write('struct _%sProxy\n'%(i.camel_name))
+            self.h.write('{\n')
+            self.h.write('  /*< private >*/\n')
+            self.h.write('  GDBusProxy parent_instance;\n')
+            self.h.write('  %sProxyPrivate *priv;\n'%(i.camel_name))
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('struct _%sProxyClass\n'%(i.camel_name))
+            self.h.write('{\n')
+            self.h.write('  GDBusProxyClass parent_class;\n')
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %s_proxy_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
+
+            self.h.write('\n')
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('void %s_proxy_new (\n'
+                         '    GDBusConnection     *connection,\n'
+                         '    GDBusProxyFlags      flags,\n'
+                         '    const gchar         *name,\n'
+                         '    const gchar         *object_path,\n'
+                         '    GCancellable        *cancellable,\n'
+                         '    GAsyncReadyCallback  callback,\n'
+                         '    gpointer             user_data);\n'
+                         %(i.name_lower))
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('%s *%s_proxy_new_finish (\n'
+                         '    GAsyncResult        *res,\n'
+                         '    GError             **error);\n'
+                         %(i.camel_name, i.name_lower))
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('%s *%s_proxy_new_sync (\n'
+                         '    GDBusConnection     *connection,\n'
+                         '    GDBusProxyFlags      flags,\n'
+                         '    const gchar         *name,\n'
+                         '    const gchar         *object_path,\n'
+                         '    GCancellable        *cancellable,\n'
+                         '    GError             **error);\n'
+                         %(i.camel_name, i.name_lower))
+            self.h.write('\n')
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('void %s_proxy_new_for_bus (\n'
+                         '    GBusType             bus_type,\n'
+                         '    GDBusProxyFlags      flags,\n'
+                         '    const gchar         *name,\n'
+                         '    const gchar         *object_path,\n'
+                         '    GCancellable        *cancellable,\n'
+                         '    GAsyncReadyCallback  callback,\n'
+                         '    gpointer             user_data);\n'
+                         %(i.name_lower))
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('%s *%s_proxy_new_for_bus_finish (\n'
+                         '    GAsyncResult        *res,\n'
+                         '    GError             **error);\n'
+                         %(i.camel_name, i.name_lower))
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('%s *%s_proxy_new_for_bus_sync (\n'
+                         '    GBusType             bus_type,\n'
+                         '    GDBusProxyFlags      flags,\n'
+                         '    const gchar         *name,\n'
+                         '    const gchar         *object_path,\n'
+                         '    GCancellable        *cancellable,\n'
+                         '    GError             **error);\n'
+                         %(i.camel_name, i.name_lower))
+            self.h.write('\n')
+
+            # Then the skeleton
+            self.h.write('\n')
+            self.h.write('/* ---- */\n')
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_%s_SKELETON (%s_skeleton_get_type ())\n'%(i.ns_upper, i.name_upper, i.name_lower))
+            self.h.write('#define %s%s_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_%s_SKELETON, %sSkeleton))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %s%s_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_%s_SKELETON, %sSkeletonClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %s%s_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_%s_SKELETON, %sSkeletonClass))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper, i.camel_name))
+            self.h.write('#define %sIS_%s_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_%s_SKELETON))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+            self.h.write('#define %sIS_%s_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_%s_SKELETON))\n'%(i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+            self.h.write('\n')
+            self.h.write('typedef struct _%sSkeleton %sSkeleton;\n'%(i.camel_name, i.camel_name))
+            self.h.write('typedef struct _%sSkeletonClass %sSkeletonClass;\n'%(i.camel_name, i.camel_name))
+            self.h.write('typedef struct _%sSkeletonPrivate %sSkeletonPrivate;\n'%(i.camel_name, i.camel_name))
+            self.h.write('\n')
+            self.h.write('struct _%sSkeleton\n'%(i.camel_name))
+            self.h.write('{\n')
+            self.h.write('  /*< private >*/\n')
+            self.h.write('  GDBusInterfaceSkeleton parent_instance;\n')
+            self.h.write('  %sSkeletonPrivate *priv;\n'%(i.camel_name))
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('struct _%sSkeletonClass\n'%(i.camel_name))
+            self.h.write('{\n')
+            self.h.write('  GDBusInterfaceSkeletonClass parent_class;\n')
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %s_skeleton_get_type (void) G_GNUC_CONST;\n'%(i.name_lower))
+            self.h.write('\n')
+            if i.deprecated:
+                self.h.write('G_GNUC_DEPRECATED ')
+            self.h.write('%s *%s_skeleton_new (void);\n'%(i.camel_name, i.name_lower))
+
+            self.h.write('\n')
+
+        # Finally, the Object, ObjectProxy, ObjectSkeleton and ObjectManagerClient
+        if self.generate_objmanager:
+            self.h.write('\n')
+            self.h.write('/* ---- */\n')
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_OBJECT (%sobject_get_type ())\n'%(self.ns_upper, self.ns_lower))
+            self.h.write('#define %sOBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT, %sObject))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sIS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('#define %sOBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), %sTYPE_OBJECT, %sObject))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('\n')
+            self.h.write('struct _%sObject;\n'%(self.namespace))
+            self.h.write('typedef struct _%sObject %sObject;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectIface %sObjectIface;\n'%(self.namespace, self.namespace))
+            self.h.write('\n')
+            self.h.write('struct _%sObjectIface\n'%(self.namespace))
+            self.h.write('{\n'
+                         '  GTypeInterface parent_iface;\n'
+                         '};\n'
+                         '\n')
+            self.h.write('GType %sobject_get_type (void) G_GNUC_CONST;\n'
+                         '\n'
+                         %(self.ns_lower))
+            for i in self.ifaces:
+                if i.deprecated:
+                    self.h.write('G_GNUC_DEPRECATED ')
+                self.h.write ('%s *%sobject_get_%s (%sObject *object);\n'
+                              %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
+            for i in self.ifaces:
+                if i.deprecated:
+                    self.h.write('G_GNUC_DEPRECATED ')
+                self.h.write ('%s *%sobject_peek_%s (%sObject *object);\n'
+                              %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_OBJECT_PROXY (%sobject_proxy_get_type ())\n'%(self.ns_upper, self.ns_lower))
+            self.h.write('#define %sOBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_PROXY, %sObjectProxy))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_PROXY, %sObjectProxyClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_PROXY, %sObjectProxyClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sIS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_PROXY))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('#define %sIS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_PROXY))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('\n')
+            self.h.write('typedef struct _%sObjectProxy %sObjectProxy;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectProxyClass %sObjectProxyClass;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectProxyPrivate %sObjectProxyPrivate;\n'%(self.namespace, self.namespace))
+            self.h.write('\n')
+            self.h.write('struct _%sObjectProxy\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  /*< private >*/\n')
+            self.h.write('  GDBusObjectProxy parent_instance;\n')
+            self.h.write('  %sObjectProxyPrivate *priv;\n'%(self.namespace))
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('struct _%sObjectProxyClass\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  GDBusObjectProxyClass parent_class;\n')
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %sobject_proxy_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
+            self.h.write('%sObjectProxy *%sobject_proxy_new (GDBusConnection *connection, const gchar *object_path);\n'%(self.namespace, self.ns_lower))
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_OBJECT_SKELETON (%sobject_skeleton_get_type ())\n'%(self.ns_upper, self.ns_lower))
+            self.h.write('#define %sOBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_SKELETON, %sObjectSkeleton))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_SKELETON, %sObjectSkeletonClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_SKELETON, %sObjectSkeletonClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sIS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_SKELETON))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('#define %sIS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_SKELETON))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('\n')
+            self.h.write('typedef struct _%sObjectSkeleton %sObjectSkeleton;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectSkeletonClass %sObjectSkeletonClass;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectSkeletonPrivate %sObjectSkeletonPrivate;\n'%(self.namespace, self.namespace))
+            self.h.write('\n')
+            self.h.write('struct _%sObjectSkeleton\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  /*< private >*/\n')
+            self.h.write('  GDBusObjectSkeleton parent_instance;\n')
+            self.h.write('  %sObjectSkeletonPrivate *priv;\n'%(self.namespace))
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('struct _%sObjectSkeletonClass\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  GDBusObjectSkeletonClass parent_class;\n')
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %sobject_skeleton_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
+            self.h.write('%sObjectSkeleton *%sobject_skeleton_new (const gchar *object_path);\n'
+                         %(self.namespace, self.ns_lower))
+            for i in self.ifaces:
+                if i.deprecated:
+                    self.h.write('G_GNUC_DEPRECATED ')
+                self.h.write ('void %sobject_skeleton_set_%s (%sObjectSkeleton *object, %s *interface_);\n'
+                              %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name))
+            self.h.write('\n')
+
+            self.h.write('/* ---- */\n')
+            self.h.write('\n')
+            self.h.write('#define %sTYPE_OBJECT_MANAGER_CLIENT (%sobject_manager_client_get_type ())\n'%(self.ns_upper, self.ns_lower))
+            self.h.write('#define %sOBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClient))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClientClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sOBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), %sTYPE_OBJECT_MANAGER_CLIENT, %sObjectManagerClientClass))\n'%(self.ns_upper, self.ns_upper, self.namespace))
+            self.h.write('#define %sIS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), %sTYPE_OBJECT_MANAGER_CLIENT))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('#define %sIS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), %sTYPE_OBJECT_MANAGER_CLIENT))\n'%(self.ns_upper, self.ns_upper))
+            self.h.write('\n')
+            self.h.write('typedef struct _%sObjectManagerClient %sObjectManagerClient;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectManagerClientClass %sObjectManagerClientClass;\n'%(self.namespace, self.namespace))
+            self.h.write('typedef struct _%sObjectManagerClientPrivate %sObjectManagerClientPrivate;\n'%(self.namespace, self.namespace))
+            self.h.write('\n')
+            self.h.write('struct _%sObjectManagerClient\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  /*< private >*/\n')
+            self.h.write('  GDBusObjectManagerClient parent_instance;\n')
+            self.h.write('  %sObjectManagerClientPrivate *priv;\n'%(self.namespace))
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('struct _%sObjectManagerClientClass\n'%(self.namespace))
+            self.h.write('{\n')
+            self.h.write('  GDBusObjectManagerClientClass parent_class;\n')
+            self.h.write('};\n')
+            self.h.write('\n')
+            self.h.write('GType %sobject_manager_client_get_type (void) G_GNUC_CONST;\n'%(self.ns_lower))
+            self.h.write('\n')
+            self.h.write('GType %sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);\n'%(self.ns_lower))
+            self.h.write('\n')
+            self.h.write('void %sobject_manager_client_new (\n'
+                         '    GDBusConnection        *connection,\n'
+                         '    GDBusObjectManagerClientFlags  flags,\n'
+                         '    const gchar            *name,\n'
+                         '    const gchar            *object_path,\n'
+                         '    GCancellable           *cancellable,\n'
+                         '    GAsyncReadyCallback     callback,\n'
+                         '    gpointer                user_data);\n'
+                         %(self.ns_lower))
+            self.h.write('GDBusObjectManager *%sobject_manager_client_new_finish (\n'
+                         '    GAsyncResult        *res,\n'
+                         '    GError             **error);\n'
+                         %(self.ns_lower))
+            self.h.write('GDBusObjectManager *%sobject_manager_client_new_sync (\n'
+                         '    GDBusConnection        *connection,\n'
+                         '    GDBusObjectManagerClientFlags  flags,\n'
+                         '    const gchar            *name,\n'
+                         '    const gchar            *object_path,\n'
+                         '    GCancellable           *cancellable,\n'
+                         '    GError                **error);\n'
+                         %(self.ns_lower))
+            self.h.write('\n')
+            self.h.write('void %sobject_manager_client_new_for_bus (\n'
+                         '    GBusType                bus_type,\n'
+                         '    GDBusObjectManagerClientFlags  flags,\n'
+                         '    const gchar            *name,\n'
+                         '    const gchar            *object_path,\n'
+                         '    GCancellable           *cancellable,\n'
+                         '    GAsyncReadyCallback     callback,\n'
+                         '    gpointer                user_data);\n'
+                         %(self.ns_lower))
+            self.h.write('GDBusObjectManager *%sobject_manager_client_new_for_bus_finish (\n'
+                         '    GAsyncResult        *res,\n'
+                         '    GError             **error);\n'
+                         %(self.ns_lower))
+            self.h.write('GDBusObjectManager *%sobject_manager_client_new_for_bus_sync (\n'
+                         '    GBusType                bus_type,\n'
+                         '    GDBusObjectManagerClientFlags  flags,\n'
+                         '    const gchar            *name,\n'
+                         '    const gchar            *object_path,\n'
+                         '    GCancellable           *cancellable,\n'
+                         '    GError                **error);\n'
+                         %(self.ns_lower))
+            self.h.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_outro(self):
+        self.h.write('\n'
+                     'G_END_DECLS\n'
+                     '\n'
+                     '#endif /* __%s__ */\n'%(self.header_guard))
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_annotations(self, prefix, annotations):
+        if annotations == None:
+            return
+
+        n = 0
+        for a in annotations:
+            #self.generate_annotations('%s_%d'%(prefix, n), a.get_annotations())
+
+            # skip internal annotations
+            if a.key.startswith('org.gtk.GDBus'):
+                continue
+
+            self.c.write('static const GDBusAnnotationInfo %s_%d =\n'
+                         '{\n'
+                         '  -1,\n'
+                         '  "%s",\n'
+                         '  "%s",\n'%(prefix, n, a.key, a.value))
+            if len(a.annotations) == 0:
+                self.c.write('  NULL\n')
+            else:
+                self.c.write('  (GDBusAnnotationInfo **) &%s_%d_pointers\n'%(prefix, n))
+            self.c.write('};\n'
+                         '\n')
+            n += 1
+
+        if n > 0:
+            self.c.write('static const GDBusAnnotationInfo * const %s_pointers[] =\n'
+                             '{\n'%(prefix))
+            m = 0;
+            for a in annotations:
+                if a.key.startswith('org.gtk.GDBus'):
+                    continue
+                self.c.write('  &%s_%d,\n'%(prefix, m))
+                m += 1
+            self.c.write('  NULL\n'
+                         '};\n'
+                         '\n')
+        return n
+
+    def generate_args(self, prefix, args):
+        for a in args:
+            num_anno = self.generate_annotations('%s_arg_%s_annotation_info'%(prefix, a.name), a.annotations)
+
+            self.c.write('static const _ExtendedGDBusArgInfo %s_%s =\n'
+                         '{\n'
+                         '  {\n'
+                         '    -1,\n'
+                         '    "%s",\n'
+                         '    "%s",\n'%(prefix, a.name, a.name, a.signature))
+            if num_anno == 0:
+                self.c.write('    NULL\n')
+            else:
+                self.c.write('    (GDBusAnnotationInfo **) &%s_arg_%s_annotation_info_pointers\n'%(prefix, a.name))
+            self.c.write('  },\n')
+            if not utils.lookup_annotation(a.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
+                self.c.write('  FALSE\n')
+            else:
+                self.c.write('  TRUE\n')
+            self.c.write('};\n'
+                         '\n')
+
+        if len(args) > 0:
+            self.c.write('static const _ExtendedGDBusArgInfo * const %s_pointers[] =\n'
+                             '{\n'%(prefix))
+            for a in args:
+                self.c.write('  &%s_%s,\n'%(prefix, a.name))
+            self.c.write('  NULL\n'
+                         '};\n'
+                         '\n')
+
+    def generate_introspection_for_interface(self, i):
+            self.c.write('/* ---- Introspection data for %s ---- */\n'
+                         '\n'%(i.name))
+
+            if len(i.methods) > 0:
+                for m in i.methods:
+                    self.generate_args('_%s_method_info_%s_IN_ARG'%(i.name_lower, m.name_lower), m.in_args)
+                    self.generate_args('_%s_method_info_%s_OUT_ARG'%(i.name_lower, m.name_lower), m.out_args)
+
+                    num_anno = self.generate_annotations('_%s_method_%s_annotation_info'%(i.name_lower, m.name_lower), m.annotations)
+
+                    self.c.write('static const _ExtendedGDBusMethodInfo _%s_method_info_%s =\n'
+                                 '{\n'
+                                 '  {\n'
+                                 '    -1,\n'
+                                 '    "%s",\n'%(i.name_lower, m.name_lower, m.name))
+                    if len(m.in_args) == 0:
+                        self.c.write('    NULL,\n')
+                    else:
+                        self.c.write('    (GDBusArgInfo **) &_%s_method_info_%s_IN_ARG_pointers,\n'%(i.name_lower, m.name_lower))
+                    if len(m.out_args) == 0:
+                        self.c.write('    NULL,\n')
+                    else:
+                        self.c.write('    (GDBusArgInfo **) &_%s_method_info_%s_OUT_ARG_pointers,\n'%(i.name_lower, m.name_lower))
+                    if num_anno == 0:
+                        self.c.write('    NULL\n')
+                    else:
+                        self.c.write('    (GDBusAnnotationInfo **) &_%s_method_%s_annotation_info_pointers\n'%(i.name_lower, m.name_lower))
+                    self.c.write('  },\n'
+                                 '  "handle-%s"\n'
+                                 %(m.name_hyphen))
+                    self.c.write('};\n'
+                                 '\n')
+
+                self.c.write('static const _ExtendedGDBusMethodInfo * const _%s_method_info_pointers[] =\n'
+                             '{\n'%(i.name_lower))
+                for m in i.methods:
+                    self.c.write('  &_%s_method_info_%s,\n'%(i.name_lower, m.name_lower))
+                self.c.write('  NULL\n'
+                             '};\n'
+                             '\n')
+
+            # ---
+
+            if len(i.signals) > 0:
+                for s in i.signals:
+                    self.generate_args('_%s_signal_info_%s_ARG'%(i.name_lower, s.name_lower), s.args)
+
+                    num_anno = self.generate_annotations('_%s_signal_%s_annotation_info'%(i.name_lower, s.name_lower), s.annotations)
+                    self.c.write('static const _ExtendedGDBusSignalInfo _%s_signal_info_%s =\n'
+                                 '{\n'
+                                 '  {\n'
+                                 '    -1,\n'
+                                 '    "%s",\n'%(i.name_lower, s.name_lower, s.name))
+                    if len(s.args) == 0:
+                        self.c.write('    NULL,\n')
+                    else:
+                        self.c.write('    (GDBusArgInfo **) &_%s_signal_info_%s_ARG_pointers,\n'%(i.name_lower, s.name_lower))
+                    if num_anno == 0:
+                        self.c.write('    NULL\n')
+                    else:
+                        self.c.write('    (GDBusAnnotationInfo **) &_%s_signal_%s_annotation_info_pointers\n'%(i.name_lower, s.name_lower))
+                    self.c.write('  },\n'
+                                 '  "%s"\n'
+                                 %(s.name_hyphen))
+                    self.c.write('};\n'
+                                 '\n')
+
+                self.c.write('static const _ExtendedGDBusSignalInfo * const _%s_signal_info_pointers[] =\n'
+                             '{\n'%(i.name_lower))
+                for s in i.signals:
+                    self.c.write('  &_%s_signal_info_%s,\n'%(i.name_lower, s.name_lower))
+                self.c.write('  NULL\n'
+                             '};\n'
+                             '\n')
+
+            # ---
+
+            if len(i.properties) > 0:
+                for p in i.properties:
+                    if p.readable and p.writable:
+                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
+                    elif p.readable:
+                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_READABLE'
+                    elif p.writable:
+                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE'
+                    else:
+                        access = 'G_DBUS_PROPERTY_INFO_FLAGS_NONE'
+                    num_anno = self.generate_annotations('_%s_property_%s_annotation_info'%(i.name_lower, p.name_lower), p.annotations)
+                    self.c.write('static const _ExtendedGDBusPropertyInfo _%s_property_info_%s =\n'
+                                 '{\n'
+                                 '  {\n'
+                                 '    -1,\n'
+                                 '    "%s",\n'
+                                 '    "%s",\n'
+                                 '    %s,\n'%(i.name_lower, p.name_lower, p.name, p.arg.signature, access))
+                    if num_anno == 0:
+                        self.c.write('    NULL\n')
+                    else:
+                        self.c.write('    (GDBusAnnotationInfo **) &_%s_property_%s_annotation_info_pointers\n'%(i.name_lower, p.name_lower))
+                    self.c.write('  },\n'
+                                 '  "%s",\n'
+                                 %(p.name_hyphen))
+                    if not utils.lookup_annotation(p.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
+                        self.c.write('  FALSE\n')
+                    else:
+                        self.c.write('  TRUE\n')
+                    self.c.write('};\n'
+                                 '\n')
+
+                self.c.write('static const _ExtendedGDBusPropertyInfo * const _%s_property_info_pointers[] =\n'
+                             '{\n'%(i.name_lower))
+                for p in i.properties:
+                    self.c.write('  &_%s_property_info_%s,\n'%(i.name_lower, p.name_lower))
+                self.c.write('  NULL\n'
+                             '};\n'
+                             '\n')
+
+            num_anno = self.generate_annotations('_%s_annotation_info'%(i.name_lower), i.annotations)
+            self.c.write('static const _ExtendedGDBusInterfaceInfo _%s_interface_info =\n'
+                         '{\n'
+                         '  {\n'
+                         '    -1,\n'
+                         '    "%s",\n'%(i.name_lower, i.name))
+            if len(i.methods) == 0:
+                self.c.write('    NULL,\n')
+            else:
+                self.c.write('    (GDBusMethodInfo **) &_%s_method_info_pointers,\n'%(i.name_lower))
+            if len(i.signals) == 0:
+                self.c.write('    NULL,\n')
+            else:
+                self.c.write('    (GDBusSignalInfo **) &_%s_signal_info_pointers,\n'%(i.name_lower))
+            if len(i.properties) == 0:
+                self.c.write('    NULL,\n')
+            else:
+                self.c.write('    (GDBusPropertyInfo **) &_%s_property_info_pointers,\n'%(i.name_lower))
+            if num_anno == 0:
+                self.c.write('    NULL\n')
+            else:
+                self.c.write('    (GDBusAnnotationInfo **) &_%s_annotation_info_pointers\n'%(i.name_lower))
+            self.c.write('  },\n'
+                         '  "%s",\n'
+                         '};\n'
+                         '\n'
+                         %(i.name_hyphen))
+            self.c.write('\n')
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %s_interface_info:\n'
+                    ' *\n'
+                    ' * Gets a machine-readable description of the #%s D-Bus interface.\n'
+                    ' *\n'
+                    ' * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.\n'
+                    %(i.name_lower, i.name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+            self.c.write('GDBusInterfaceInfo *\n'
+                         '%s_interface_info (void)\n'
+                         '{\n'
+                         '  return (GDBusInterfaceInfo *) &_%s_interface_info;\n'
+                         '}\n'
+                         '\n'%(i.name_lower, i.name_lower))
+
+            if len(i.properties) > 0:
+                self.c.write(self.docbook_gen.expand(
+                        '/**\n'
+                        ' * %s_override_properties:\n'
+                        ' * @klass: The class structure for a #GObject<!-- -->-derived class.\n'
+                        ' * @property_id_begin: The property id to assign to the first overridden property.\n'
+                        ' *\n'
+                        ' * Overrides all #GObject properties in the #%s interface for a concrete class.\n'
+                        ' * The properties are overridden in the order they are defined.\n'
+                        ' *\n'
+                        ' * Returns: The last property id.\n'
+                        %(i.name_lower, i.camel_name), False))
+                self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+                self.c.write('guint\n'
+                             '%s_override_properties (GObjectClass *klass, guint property_id_begin)\n'
+                             '{\n'%(i.name_lower))
+                for p in i.properties:
+                    self.c.write ('  g_object_class_override_property (klass, property_id_begin++, "%s");\n'%(p.name_hyphen))
+                self.c.write('  return property_id_begin - 1;\n'
+                             '}\n'
+                             '\n')
+            self.c.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_interface(self, i):
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s:\n'
+                ' *\n'
+                ' * Abstract interface type for the D-Bus interface #%s.\n'
+                %(i.camel_name, i.name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sIface:\n'
+                ' * @parent_iface: The parent interface.\n'
+                %(i.camel_name), False))
+
+        doc_bits = {}
+        if len(i.methods) > 0:
+            for m in i.methods:
+                key = (m.since, '_method_%s'%m.name_lower)
+                value  = '@handle_%s: '%(m.name_lower)
+                value += 'Handler for the #%s::handle-%s signal.'%(i.camel_name, m.name_hyphen)
+                doc_bits[key] = value
+        if len(i.signals) > 0:
+            for s in i.signals:
+                key = (s.since, '_signal_%s'%s.name_lower)
+                value  = '@%s: '%(s.name_lower)
+                value += 'Handler for the #%s::%s signal.'%(i.camel_name, s.name_hyphen)
+                doc_bits[key] = value
+        keys = doc_bits.keys()
+        if len(keys) > 0:
+            keys.sort(cmp=utils.my_version_cmp)
+            for key in keys:
+                self.c.write(' * %s\n'%doc_bits[key])
+        self.c.write(self.docbook_gen.expand(
+                ' *\n'
+                ' * Virtual table for the D-Bus interface #%s.\n'
+                %(i.name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write('static void\n'
+                     '%s_default_init (%sIface *iface)\n'
+                     '{\n'%(i.name_lower, i.camel_name));
+
+        if len(i.methods) > 0:
+            self.c.write('  /* GObject signals for incoming D-Bus method calls: */\n')
+            for m in i.methods:
+                self.c.write(self.docbook_gen.expand(
+                        '  /**\n'
+                        '   * %s::handle-%s:\n'
+                        '   * @object: A #%s.\n'
+                        '   * @invocation: A #GDBusMethodInvocation.\n'
+                        %(i.camel_name, m.name_hyphen, i.camel_name), False))
+                for a in m.in_args:
+                    self.c.write ('   * @%s: Argument passed by remote caller.\n'%(a.name))
+                self.c.write(self.docbook_gen.expand(
+                        '   *\n'
+                        '   * Signal emitted when a remote caller is invoking the %s.%s() D-Bus method.\n'
+                        '   *\n'
+                        '   * If a signal handler returns %%TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call %s_complete_%s() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %%G_DBUS_ERROR_UNKNOWN_METHOD error is returned.\n'
+                        '   *\n'
+                        '   * Returns: %%TRUE if the invocation was handled, %%FALSE to let other signal handlers run.\n'
+                        %(i.name, m.name, i.name_lower, m.name_lower), False))
+                self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 2)
+                self.c.write('  g_signal_new ("handle-%s",\n'
+                             '    G_TYPE_FROM_INTERFACE (iface),\n'
+                             '    G_SIGNAL_RUN_LAST,\n'
+                             '    G_STRUCT_OFFSET (%sIface, handle_%s),\n'
+                             '    g_signal_accumulator_true_handled,\n'
+                             '    NULL,\n' # accu_data
+                             '    g_cclosure_marshal_generic,\n'
+                             '    G_TYPE_BOOLEAN,\n'
+                             '    %d,\n'
+                             '    G_TYPE_DBUS_METHOD_INVOCATION'
+                             %(m.name_hyphen, i.camel_name, m.name_lower, len(m.in_args) + 1))
+                for a in m.in_args:
+                    self.c.write (', %s'%(a.gtype))
+                self.c.write(');\n')
+                self.c.write('\n')
+
+        if len(i.signals) > 0:
+            self.c.write('  /* GObject signals for received D-Bus signals: */\n')
+            for s in i.signals:
+                self.c.write(self.docbook_gen.expand(
+                        '  /**\n'
+                        '   * %s::%s:\n'
+                        '   * @object: A #%s.\n'
+                        %(i.camel_name, s.name_hyphen, i.camel_name), False))
+                for a in s.args:
+                    self.c.write ('   * @%s: Argument.\n'%(a.name))
+                self.c.write(self.docbook_gen.expand(
+                        '   *\n'
+                        '   * On the client-side, this signal is emitted whenever the D-Bus signal #%s::%s is received.\n'
+                        '   *\n'
+                        '   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.\n'
+                        %(i.name, s.name), False))
+                self.write_gtkdoc_deprecated_and_since_and_close(s, self.c, 2)
+                self.c.write('  g_signal_new ("%s",\n'
+                             '    G_TYPE_FROM_INTERFACE (iface),\n'
+                             '    G_SIGNAL_RUN_LAST,\n'
+                             '    G_STRUCT_OFFSET (%sIface, %s),\n'
+                             '    NULL,\n' # accumulator
+                             '    NULL,\n' # accu_data
+                             '    g_cclosure_marshal_generic,\n'
+                             '    G_TYPE_NONE,\n'
+                             '    %d'
+                             %(s.name_hyphen, i.camel_name, s.name_lower, len(s.args)))
+                for a in s.args:
+                    self.c.write (', %s'%(a.gtype))
+                self.c.write(');\n')
+                self.c.write('\n')
+
+        if len(i.properties) > 0:
+            self.c.write('  /* GObject properties for D-Bus properties: */\n')
+            for p in i.properties:
+                if p.readable and p.writable:
+                    hint = 'Since the D-Bus property for this #GObject property is both readable and writable, it is meaningful to both read from it and write to it on both the service- and client-side.'
+                elif p.readable:
+                    hint = 'Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.'
+                elif p.writable:
+                    hint = 'Since the D-Bus property for this #GObject property is writable but not readable, it is meaningful to write to it on both the client- and service-side. It is only meaningful, however, to read from it on the service-side.'
+                else:
+                    raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
+                self.c.write(self.docbook_gen.expand(
+                        '  /**\n'
+                        '   * %s:%s:\n'
+                        '   *\n'
+                        '   * Represents the D-Bus property #%s:%s.\n'
+                        '   *\n'
+                        '   * %s\n'
+                        %(i.camel_name, p.name_hyphen, i.name, p.name, hint), False))
+                self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 2)
+                self.c.write('  g_object_interface_install_property (iface,\n')
+                if p.arg.gtype == 'G_TYPE_VARIANT':
+                    s = 'g_param_spec_variant ("%s", "%s", "%s", G_VARIANT_TYPE ("%s"), NULL'%(p.name_hyphen, p.name, p.name, p.arg.signature)
+                elif p.arg.signature == 'b':
+                    s = 'g_param_spec_boolean ("%s", "%s", "%s", FALSE'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'y':
+                    s = 'g_param_spec_uchar ("%s", "%s", "%s", 0, 255, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'n':
+                    s = 'g_param_spec_int ("%s", "%s", "%s", G_MININT16, G_MAXINT16, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'q':
+                    s = 'g_param_spec_uint ("%s", "%s", "%s", 0, G_MAXUINT16, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'i':
+                    s = 'g_param_spec_int ("%s", "%s", "%s", G_MININT32, G_MAXINT32, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'u':
+                    s = 'g_param_spec_uint ("%s", "%s", "%s", 0, G_MAXUINT32, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'x':
+                    s = 'g_param_spec_int64 ("%s", "%s", "%s", G_MININT64, G_MAXINT64, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 't':
+                    s = 'g_param_spec_uint64 ("%s", "%s", "%s", 0, G_MAXUINT64, 0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'd':
+                    s = 'g_param_spec_double ("%s", "%s", "%s", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 's':
+                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'o':
+                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'g':
+                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'ay':
+                    s = 'g_param_spec_string ("%s", "%s", "%s", NULL'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'as':
+                    s = 'g_param_spec_boxed ("%s", "%s", "%s", G_TYPE_STRV'%(p.name_hyphen, p.name, p.name)
+                elif p.arg.signature == 'aay':
+                    s = 'g_param_spec_boxed ("%s", "%s", "%s", G_TYPE_STRV'%(p.name_hyphen, p.name, p.name)
+                else:
+                    raise RuntimeError('Unsupported gtype %s for GParamSpec'%(p.arg.gtype))
+                self.c.write('    %s, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));'%s);
+                self.c.write('\n')
+
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write('typedef %sIface %sInterface;\n'%(i.camel_name, i.camel_name))
+        self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT);\n'%(i.camel_name, i.name_lower))
+        self.c.write('\n')
+
+    # ----------------------------------------------------------------------------------------------------
+
+    def generate_property_accessors(self, i):
+        for p in i.properties:
+            # getter
+            if p.readable and p.writable:
+                hint = 'Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.'
+            elif p.readable:
+                hint = 'Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.'
+            elif p.writable:
+                hint = 'Since this D-Bus property is not readable, it is only meaningful to use this function on the service-side.'
+            else:
+                raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %s_get_%s:\n'
+                    ' * @object: A #%s.\n'
+                    ' *\n'
+                    ' * Gets the value of the #%s:%s D-Bus property.\n'
+                    ' *\n'
+                    ' * %s\n'
+                    ' *\n'
+                    ' * Returns: (transfer none): The property value.\n'
+                    %(i.name_lower, p.name_lower, i.camel_name, i.name, p.name, hint), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 0)
+            self.c.write('%s\n'
+                         '%s_get_%s (%s *object)\n'
+                         '{\n'
+                         '  %svalue;\n'%(p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in_g))
+            self.c.write('  g_object_get (G_OBJECT (object), "%s", &value, NULL);\n'%(p.name_hyphen))
+            if p.arg.free_func:
+                self.c.write('  if (value != NULL)\n'
+                             '    g_object_set_data_full (G_OBJECT (object), "-x-memoizing-%s", (gpointer) value, (GDestroyNotify) %s);\n'
+                             '  else\n'
+                             '    g_object_set_data_full (G_OBJECT (object), "-x-memoizing-%s", (gpointer) value, NULL);\n'
+                             %(p.name_hyphen, p.arg.free_func, p.name_hyphen))
+            self.c.write('  return value;\n')
+            self.c.write('}\n')
+            self.c.write('\n')
+            # setter
+            if p.readable and p.writable:
+                hint = 'Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.'
+            elif p.readable:
+                hint = 'Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.'
+            elif p.writable:
+                hint = 'Since this D-Bus property is writable, it is meaningful to use this function on both the client- and service-side.'
+            else:
+                raise RuntimeError('Cannot handle property %s that neither readable nor writable'%(p.name))
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %s_set_%s:\n'
+                    ' * @object: A #%s.\n'
+                    ' * @value: The value to set.\n'
+                    ' *\n'
+                    ' * Sets the #%s:%s D-Bus property to @value.\n'
+                    ' *\n'
+                    ' * %s\n'
+                    %(i.name_lower, p.name_lower, i.camel_name, i.name, p.name, hint), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(p, self.c, 0)
+            self.c.write('void\n'
+                         '%s_set_%s (%s *object, %svalue)\n'
+                         '{\n'%(i.name_lower, p.name_lower, i.camel_name, p.arg.ctype_in, ))
+            self.c.write('  g_object_set (G_OBJECT (object), "%s", value, NULL);\n'%(p.name_hyphen))
+            self.c.write('}\n')
+            self.c.write('\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_signal_emitters(self, i):
+        for s in i.signals:
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %s_emit_%s:\n'
+                    ' * @object: A #%s.\n'
+                    %(i.name_lower, s.name_lower, i.camel_name), False))
+            for a in s.args:
+                self.c.write(' * @%s: Argument to pass with the signal.\n'%(a.name))
+            self.c.write(self.docbook_gen.expand(
+                    ' *\n'
+                    ' * Emits the #%s::%s D-Bus signal.\n'
+                    %(i.name, s.name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(s, self.c, 0)
+            self.c.write('void\n'
+                         '%s_emit_%s (\n'
+                         '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
+            for a in s.args:
+                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
+            self.c.write(')\n'
+                         '{\n'
+                         '  g_signal_emit_by_name (object, "%s"'%(s.name_hyphen))
+            for a in s.args:
+                self.c.write(', %s'%a.name)
+            self.c.write(');\n')
+            self.c.write('}\n'
+                         '\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_method_calls(self, i):
+        for m in i.methods:
+            # async begin
+            self.c.write('/**\n'
+                         ' * %s_call_%s:\n'
+                         ' * @proxy: A #%sProxy.\n'
+                         %(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.in_args:
+                self.c.write(' * @%s: Argument to pass with the method invocation.\n'%(a.name))
+            self.c.write(self.docbook_gen.expand(
+                    ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                    ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %%NULL.\n'
+                    ' * @user_data: User data to pass to @callback.\n'
+                    ' *\n'
+                    ' * Asynchronously invokes the %s.%s() D-Bus method on @proxy.\n'
+                    ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
+                    ' * You can then call %s_call_%s_finish() to get the result of the operation.\n'
+                    ' *\n'
+                    ' * See %s_call_%s_sync() for the synchronous, blocking version of this method.\n'
+                    %(i.name, m.name, i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
+            self.c.write('void\n'
+                         '%s_call_%s (\n'
+                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.in_args:
+                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
+            self.c.write(',\n'
+                         '    GCancellable *cancellable,\n'
+                         '    GAsyncReadyCallback callback,\n'
+                         '    gpointer user_data)\n'
+                         '{\n')
+            self.c.write('  g_dbus_proxy_call (G_DBUS_PROXY (proxy),\n'
+                         '    "%s",\n'
+                         '    g_variant_new ("('%(m.name))
+            for a in m.in_args:
+                self.c.write('%s'%(a.format_in))
+            self.c.write(')"')
+            for a in m.in_args:
+                self.c.write(',\n                   %s'%(a.name))
+            self.c.write('),\n'
+                         '    G_DBUS_CALL_FLAGS_NONE,\n'
+                         '    -1,\n'
+                         '    cancellable,\n'
+                         '    callback,\n'
+                         '    user_data);\n')
+            self.c.write('}\n'
+                         '\n')
+            # async finish
+            self.c.write('/**\n'
+                         ' * %s_call_%s_finish:\n'
+                         ' * @proxy: A #%sProxy.\n'
+                         %(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.out_args:
+                self.c.write(' * @out_%s: (out): Return location for return parameter or %%NULL to ignore.\n'%(a.name))
+            self.c.write(self.docbook_gen.expand(
+                    ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_call_%s().\n'
+                    ' * @error: Return location for error or %%NULL.\n'
+                    ' *\n'
+                    ' * Finishes an operation started with %s_call_%s().\n'
+                    ' *\n'
+                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+                    %(i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
+            self.c.write('gboolean\n'
+                         '%s_call_%s_finish (\n'
+                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.out_args:
+                self.c.write(',\n    %sout_%s'%(a.ctype_out, a.name))
+            self.c.write(',\n'
+                         '    GAsyncResult *res,\n'
+                         '    GError **error)\n'
+                         '{\n'
+                         '  GVariant *_ret;\n'
+                         '  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);\n'
+                         '  if (_ret == NULL)\n'
+                         '    goto _out;\n')
+            self.c.write('  g_variant_get (_ret,\n'
+                         '                 \"(')
+            for a in m.out_args:
+                self.c.write('%s'%(a.format_out))
+            self.c.write(')"')
+            for a in m.out_args:
+                self.c.write(',\n                 out_%s'%(a.name))
+            self.c.write(');\n'
+                         '  g_variant_unref (_ret);\n')
+            self.c.write('_out:\n'
+                         '  return _ret != NULL;\n'
+                         '}\n'
+                         '\n')
+
+
+            # sync
+            self.c.write('/**\n'
+                         ' * %s_call_%s_sync:\n'
+                         ' * @proxy: A #%sProxy.\n'
+                         %(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.in_args:
+                self.c.write(' * @%s: Argument to pass with the method invocation.\n'%(a.name))
+            for a in m.out_args:
+                self.c.write(' * @out_%s: (out): Return location for return parameter or %%NULL to ignore.\n'%(a.name))
+            self.c.write(self.docbook_gen.expand(
+                    ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                    ' * @error: Return location for error or %%NULL.\n'
+                    ' *\n'
+                    ' * Synchronously invokes the %s.%s() D-Bus method on @proxy. The calling thread is blocked until a reply is received.\n'
+                    ' *\n'
+                    ' * See %s_call_%s() for the asynchronous version of this method.\n'
+                    ' *\n'
+                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+                    %(i.name, m.name, i.name_lower, m.name_lower), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
+            self.c.write('gboolean\n'
+                         '%s_call_%s_sync (\n'
+                         '    %s *proxy'%(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.in_args:
+                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
+            for a in m.out_args:
+                self.c.write(',\n    %sout_%s'%(a.ctype_out, a.name))
+            self.c.write(',\n'
+                         '    GCancellable *cancellable,\n'
+                         '    GError **error)\n'
+                         '{\n'
+                         '  GVariant *_ret;\n')
+            self.c.write('  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),\n'
+                         '    "%s",\n'
+                         '    g_variant_new ("('%(m.name))
+            for a in m.in_args:
+                self.c.write('%s'%(a.format_in))
+            self.c.write(')"')
+            for a in m.in_args:
+                self.c.write(',\n                   %s'%(a.name))
+            self.c.write('),\n'
+                         '    G_DBUS_CALL_FLAGS_NONE,\n'
+                         '    -1,\n'
+                         '    cancellable,\n'
+                         '    error);\n'
+                         '  if (_ret == NULL)\n'
+                         '    goto _out;\n')
+            self.c.write('  g_variant_get (_ret,\n'
+                         '                 \"(')
+            for a in m.out_args:
+                self.c.write('%s'%(a.format_out))
+            self.c.write(')"')
+            for a in m.out_args:
+                self.c.write(',\n                 out_%s'%(a.name))
+            self.c.write(');\n'
+                         '  g_variant_unref (_ret);\n')
+            self.c.write('_out:\n'
+                         '  return _ret != NULL;\n'
+                         '}\n'
+                         '\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_method_completers(self, i):
+        for m in i.methods:
+            self.c.write('/**\n'
+                         ' * %s_complete_%s:\n'
+                         ' * @object: A #%s.\n'
+                         ' * @invocation: (transfer full): A #GDBusMethodInvocation.\n'
+                         %(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.out_args:
+                self.c.write(' * @%s: Parameter to return.\n'%(a.name))
+            self.c.write(self.docbook_gen.expand(
+                    ' *\n'
+                    ' * Helper function used in service implementations to finish handling invocations of the %s.%s() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.\n'
+                    ' *\n'
+                    ' * This method will free @invocation, you cannot use it afterwards.\n'
+                    %(i.name, m.name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(m, self.c, 0)
+            self.c.write('void\n'
+                         '%s_complete_%s (\n'
+                         '    %s *object,\n'
+                         '    GDBusMethodInvocation *invocation'%(i.name_lower, m.name_lower, i.camel_name))
+            for a in m.out_args:
+                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
+            self.c.write(')\n'
+                         '{\n')
+
+            self.c.write('  g_dbus_method_invocation_return_value (invocation,\n'
+                         '    g_variant_new ("(')
+            for a in m.out_args:
+                self.c.write('%s'%(a.format_in))
+            self.c.write(')"')
+            for a in m.out_args:
+                self.c.write(',\n                   %s'%(a.name))
+            self.c.write('));\n'
+                         '}\n'
+                         '\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_proxy(self, i):
+        # class boilerplate
+        self.c.write('/* ------------------------------------------------------------------------ */\n'
+                     '\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sProxy:\n'
+                ' *\n'
+                ' * The #%sProxy structure contains only private data and should only be accessed using the provided API.\n'
+                %(i.camel_name, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sProxyClass:\n'
+                ' * @parent_class: The parent class.\n'
+                ' *\n'
+                ' * Class structure for #%sProxy.\n'
+                %(i.camel_name, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write('static void\n'
+                     '%s_proxy_iface_init (%sIface *iface)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'%(i.name_lower, i.camel_name))
+        self.c.write('#define %s_proxy_get_type %s_proxy_get_type\n'%(i.name_lower, i.name_lower))
+        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sProxy, %s_proxy, G_TYPE_DBUS_PROXY,\n'%(i.camel_name, i.name_lower))
+        self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init));\n'%(i.ns_upper, i.name_upper, i.name_lower))
+        self.c.write('#undef %s_proxy_get_type\n'
+                     '\n'%(i.name_lower))
+
+        # property accessors
+        #
+        # Note that we are guaranteed that prop_id starts at 1 and is
+        # laid out in the same order as introspection data pointers
+        #
+        self.c.write('static void\n'
+                     '%s_proxy_get_property (GObject      *object,\n'
+                     '  guint         prop_id,\n'
+                     '  GValue       *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'%(i.name_lower))
+        if len(i.properties) > 0:
+            self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
+                         '  GVariant *variant;\n'
+                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
+                         '  info = _%s_property_info_pointers[prop_id - 1];\n'
+                         '  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);\n'
+                         '  if (info->use_gvariant)\n'
+                         '    {\n'
+                         '      g_value_set_variant (value, variant);\n'
+                         '    }\n'
+                         '  else\n'
+                         '    {\n'
+                         # could be that we don't have the value in cache - in that case, we do
+                         # nothing and the user gets the default value for the GType
+                         '      if (variant != NULL)\n'
+                         '        g_dbus_gvariant_to_gvalue (variant, value);\n'
+                         '    }\n'
+                         '  if (variant != NULL)\n'
+                         '    g_variant_unref (variant);\n'
+                         %(len(i.properties), i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+        if len(i.properties) > 0:
+            self.c.write('static void\n'
+                         '%s_proxy_set_property_cb (GDBusProxy *proxy,\n'
+                         '  GAsyncResult *res,\n'
+                         '  gpointer      user_data)\n'
+                         '{\n'%(i.name_lower))
+            self.c.write('  const _ExtendedGDBusPropertyInfo *info = user_data;\n'
+                         '  GError *error;\n'
+                         '  error = NULL;\n'
+                         '  if (!g_dbus_proxy_call_finish (proxy, res, &error))\n'
+                         '    {\n'
+                         '      g_warning ("Error setting property `%%s\' on interface %s: %%s (%%s, %%d)",\n'
+                         '                 info->parent_struct.name, \n'
+                         '                 error->message, g_quark_to_string (error->domain), error->code);\n'
+                         '      g_error_free (error);\n'
+                         '    }\n'
+                         %(i.name))
+            self.c.write('}\n'
+                         '\n')
+        self.c.write('static void\n'
+                     '%s_proxy_set_property (GObject      *object,\n'
+                     '  guint         prop_id,\n'
+                     '  const GValue *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'%(i.name_lower))
+        if len(i.properties) > 0:
+            self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
+                         '  GVariant *variant;\n'
+                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
+                         '  info = _%s_property_info_pointers[prop_id - 1];\n'
+                         '  variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));\n'
+                         '  g_dbus_proxy_call (G_DBUS_PROXY (object),\n'
+                         '    "org.freedesktop.DBus.Properties.Set",\n'
+                         '    g_variant_new ("(ssv)", "%s", info->parent_struct.name, variant),\n'
+                         '    G_DBUS_CALL_FLAGS_NONE,\n'
+                         '    -1,\n'
+                         '    NULL, (GAsyncReadyCallback) %s_proxy_set_property_cb, (gpointer) info);\n'
+                         '  g_variant_unref (variant);\n'
+                         %(len(i.properties), i.name_lower, i.name, i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        # signal received
+        self.c.write('static void\n'
+                     '%s_proxy_g_signal (GDBusProxy *proxy,\n'
+                     '  const gchar *sender_name,\n'
+                     '  const gchar *signal_name,\n'
+                     '  GVariant *parameters)\n'
+                     '{\n'%(i.name_lower))
+        self.c.write('  _ExtendedGDBusSignalInfo *info;\n'
+                     '  GVariantIter iter;\n'
+                     '  GVariant *child;\n'
+                     '  GValue *paramv;\n'
+                     '  guint num_params;\n'
+                     '  guint n;\n'
+                     '  guint signal_id;\n');
+        # Note: info could be NULL if we are talking to a newer version of the interface
+        self.c.write('  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_%s_interface_info, signal_name);\n'
+                     '  if (info == NULL)\n'
+                     '    return;\n'
+                     %(i.name_lower))
+        self.c.write ('  num_params = g_variant_n_children (parameters);\n'
+                      '  paramv = g_new0 (GValue, num_params + 1);\n'
+                      '  g_value_init (&paramv[0], %sTYPE_%s);\n'
+                      '  g_value_set_object (&paramv[0], proxy);\n'
+                      %(i.ns_upper, i.name_upper))
+        self.c.write('  g_variant_iter_init (&iter, parameters);\n'
+                     '  n = 1;\n'
+                     '  while ((child = g_variant_iter_next_value (&iter)) != NULL)\n'
+                     '    {\n'
+                     '      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];\n'
+                     '      if (arg_info->use_gvariant)\n'
+                     '        {\n'
+                     '          g_value_init (&paramv[n], G_TYPE_VARIANT);\n'
+                     '          g_value_set_variant (&paramv[n], child);\n'
+                     '          n++;\n'
+                     '        }\n'
+                     '      else\n'
+                     '        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);\n'
+                     '      g_variant_unref (child);\n'
+                     '    }\n'
+                     )
+        self.c.write('  signal_id = g_signal_lookup (info->signal_name, %sTYPE_%s);\n'
+                     %(i.ns_upper, i.name_upper))
+        self.c.write('  g_signal_emitv (paramv, signal_id, 0, NULL);\n')
+        self.c.write('  for (n = 0; n < num_params + 1; n++)\n'
+                     '    g_value_unset (&paramv[n]);\n'
+                     '  g_free (paramv);\n')
+        self.c.write('}\n'
+                     '\n')
+
+        # property changed
+        self.c.write('static void\n'
+                     '%s_proxy_g_properties_changed (GDBusProxy *proxy,\n'
+                     '  GVariant *changed_properties,\n'
+                     '  const gchar *const *invalidated_properties)\n'
+                     '{\n'%(i.name_lower))
+        # Note: info could be NULL if we are talking to a newer version of the interface
+        self.c.write('  guint n;\n'
+                     '  const gchar *key;\n'
+                     '  GVariantIter *iter;\n'
+                     '  _ExtendedGDBusPropertyInfo *info;\n'
+                     '  g_variant_get (changed_properties, "a{sv}", &iter);\n'
+                     '  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))\n'
+                     '    {\n'
+                     '      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, key);\n'
+                     '      if (info != NULL)\n'
+                     '        g_object_notify (G_OBJECT (proxy), info->hyphen_name);\n'
+                     '    }\n'
+                     '  g_variant_iter_free (iter);\n'
+                     '  for (n = 0; invalidated_properties[n] != NULL; n++)\n'
+                     '    {\n'
+                     '      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, invalidated_properties[n]);\n'
+                     '      if (info != NULL)\n'
+                     '        g_object_notify (G_OBJECT (proxy), info->hyphen_name);\n'
+                     '    }\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower, i.name_lower))
+
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%s_proxy_init (%sProxy *proxy)\n'
+                     '{\n'
+                     '  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), %s_interface_info ());\n'
+                     '}\n'
+                     '\n'%(i.name_lower, i.camel_name, i.name_lower))
+        self.c.write('static void\n'
+                     '%s_proxy_class_init (%sProxyClass *klass)\n'
+                     '{\n'
+                     '  GObjectClass *gobject_class;\n'
+                     '  GDBusProxyClass *proxy_class;\n'
+                     '\n'
+                     '  gobject_class = G_OBJECT_CLASS (klass);\n'
+                     '  gobject_class->get_property = %s_proxy_get_property;\n'
+                     '  gobject_class->set_property = %s_proxy_set_property;\n'
+                     '\n'
+                     '  proxy_class = G_DBUS_PROXY_CLASS (klass);\n'
+                     '  proxy_class->g_signal = %s_proxy_g_signal;\n'
+                     '  proxy_class->g_properties_changed = %s_proxy_g_properties_changed;\n'
+                     '\n'%(i.name_lower, i.camel_name, i.name_lower, i.name_lower, i.name_lower, i.name_lower))
+        if len(i.properties) > 0:
+            self.c.write('\n'
+                         '  %s_override_properties (gobject_class, 1);\n'%(i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        # constructors
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s_proxy_new:\n'
+                ' * @connection: A #GDBusConnection.\n'
+                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
+                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
+                ' * @user_data: User data to pass to @callback.\n'
+                ' *\n'
+                ' * Asynchronously creates a proxy for the D-Bus interface #%s. See g_dbus_proxy_new() for more details.\n'
+                ' *\n'
+                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
+                ' * You can then call %s_proxy_new_finish() to get the result of the operation.\n'
+                ' *\n'
+                ' * See %s_proxy_new_sync() for the synchronous, blocking version of this constructor.\n'
+                %(i.name_lower, i.name, i.name_lower, i.name_lower), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('void\n'
+                     '%s_proxy_new (\n'
+                     '    GDBusConnection     *connection,\n'
+                     '    GDBusProxyFlags      flags,\n'
+                     '    const gchar         *name,\n'
+                     '    const gchar         *object_path,\n'
+                     '    GCancellable        *cancellable,\n'
+                     '    GAsyncReadyCallback  callback,\n'
+                     '    gpointer             user_data)\n'
+                     '{\n'
+                     '  g_async_initable_new_async (%sTYPE_%s_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower, i.ns_upper, i.name_upper, i.name))
+        self.c.write('/**\n'
+                     ' * %s_proxy_new_finish:\n'
+                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_proxy_new().\n'
+                     ' * @error: Return location for error or %%NULL\n'
+                     ' *\n'
+                     ' * Finishes an operation started with %s_proxy_new().\n'
+                     ' *\n'
+                     ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
+                     %(i.name_lower, i.name_lower, i.name_lower, i.camel_name))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('%s *\n'
+                     '%s_proxy_new_finish (\n'
+                     '    GAsyncResult        *res,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GObject *ret;\n'
+                     '  GObject *source_object;\n'
+                     '  source_object = g_async_result_get_source_object (res);\n'
+                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
+                     '  g_object_unref (source_object);\n'
+                     '  if (ret != NULL)\n'
+                     '    return %s%s (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper))
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s_proxy_new_sync:\n'
+                ' * @connection: A #GDBusConnection.\n'
+                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
+                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @error: Return location for error or %%NULL\n'
+                ' *\n'
+                ' * Synchronously creates a proxy for the D-Bus interface #%s. See g_dbus_proxy_new_sync() for more details.\n'
+                ' *\n'
+                ' * The calling thread is blocked until a reply is received.\n'
+                ' *\n'
+                ' * See %s_proxy_new() for the asynchronous version of this constructor.\n'
+                ' *\n'
+                ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
+                %(i.name_lower, i.name, i.name_lower, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('%s *\n'
+                     '%s_proxy_new_sync (\n'
+                     '    GDBusConnection     *connection,\n'
+                     '    GDBusProxyFlags      flags,\n'
+                     '    const gchar         *name,\n'
+                     '    const gchar         *object_path,\n'
+                     '    GCancellable        *cancellable,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GInitable *ret;\n'
+                     '  ret = g_initable_new (%sTYPE_%s_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
+                     '  if (ret != NULL)\n'
+                     '    return %s%s (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.name, i.ns_upper, i.name_upper))
+        self.c.write('\n')
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s_proxy_new_for_bus:\n'
+                ' * @bus_type: A #GBusType.\n'
+                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
+                ' * @name: A bus name (well-known or unique).\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
+                ' * @user_data: User data to pass to @callback.\n'
+                ' *\n'
+                ' * Like %s_proxy_new() but takes a #GBusType instead of a #GDBusConnection.\n'
+                ' *\n'
+                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
+                ' * You can then call %s_proxy_new_for_bus_finish() to get the result of the operation.\n'
+                ' *\n'
+                ' * See %s_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.\n'
+                %(i.name_lower, i.name_lower, i.name_lower, i.name_lower), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('void\n'
+                     '%s_proxy_new_for_bus (\n'
+                     '    GBusType             bus_type,\n'
+                     '    GDBusProxyFlags      flags,\n'
+                     '    const gchar         *name,\n'
+                     '    const gchar         *object_path,\n'
+                     '    GCancellable        *cancellable,\n'
+                     '    GAsyncReadyCallback  callback,\n'
+                     '    gpointer             user_data)\n'
+                     '{\n'
+                     '  g_async_initable_new_async (%sTYPE_%s_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower, i.ns_upper, i.name_upper, i.name))
+        self.c.write('/**\n'
+                     ' * %s_proxy_new_for_bus_finish:\n'
+                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %s_proxy_new_for_bus().\n'
+                     ' * @error: Return location for error or %%NULL\n'
+                     ' *\n'
+                     ' * Finishes an operation started with %s_proxy_new_for_bus().\n'
+                     ' *\n'
+                     ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
+                     %(i.name_lower, i.name_lower, i.name_lower, i.camel_name))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('%s *\n'
+                     '%s_proxy_new_for_bus_finish (\n'
+                     '    GAsyncResult        *res,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GObject *ret;\n'
+                     '  GObject *source_object;\n'
+                     '  source_object = g_async_result_get_source_object (res);\n'
+                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
+                     '  g_object_unref (source_object);\n'
+                     '  if (ret != NULL)\n'
+                     '    return %s%s (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper))
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s_proxy_new_for_bus_sync:\n'
+                ' * @bus_type: A #GBusType.\n'
+                ' * @flags: Flags from the #GDBusProxyFlags enumeration.\n'
+                ' * @name: A bus name (well-known or unique).\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @error: Return location for error or %%NULL\n'
+                ' *\n'
+                ' * Like %s_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.\n'
+                ' *\n'
+                ' * The calling thread is blocked until a reply is received.\n'
+                ' *\n'
+                ' * See %s_proxy_new_for_bus() for the asynchronous version of this constructor.\n'
+                ' *\n'
+                ' * Returns: (transfer full) (type %sProxy): The constructed proxy object or %%NULL if @error is set.\n'
+                %(i.name_lower, i.name_lower, i.name_lower, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('%s *\n'
+                     '%s_proxy_new_for_bus_sync (\n'
+                     '    GBusType             bus_type,\n'
+                     '    GDBusProxyFlags      flags,\n'
+                     '    const gchar         *name,\n'
+                     '    const gchar         *object_path,\n'
+                     '    GCancellable        *cancellable,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GInitable *ret;\n'
+                     '  ret = g_initable_new (%sTYPE_%s_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "%s", NULL);\n'
+                     '  if (ret != NULL)\n'
+                     '    return %s%s (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.name, i.ns_upper, i.name_upper))
+        self.c.write('\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_skeleton(self, i):
+        # class boilerplate
+        self.c.write('/* ------------------------------------------------------------------------ */\n'
+                     '\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sSkeleton:\n'
+                ' *\n'
+                ' * The #%sSkeleton structure contains only private data and should only be accessed using the provided API.\n'
+                %(i.camel_name, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sSkeletonClass:\n'
+                ' * @parent_class: The parent class.\n'
+                ' *\n'
+                ' * Class structure for #%sSkeleton.\n'
+                %(i.camel_name, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('\n')
+
+        self.c.write('struct _%sSkeletonPrivate\n'
+                     '{\n'
+                     '  GValueArray *properties;\n'
+                     '  GList *changed_properties;\n'
+                     '  GSource *changed_properties_idle_source;\n'
+                     '  GMainContext *context;\n'
+                     '  GMutex *lock;\n'
+                     '};\n'
+                     '\n'%i.camel_name)
+
+        self.c.write('static void\n'
+                     '_%s_skeleton_handle_method_call (\n'
+                     '  GDBusConnection *connection,\n'
+                     '  const gchar *sender,\n'
+                     '  const gchar *object_path,\n'
+                     '  const gchar *interface_name,\n'
+                     '  const gchar *method_name,\n'
+                     '  GVariant *parameters,\n'
+                     '  GDBusMethodInvocation *invocation,\n'
+                     '  gpointer user_data)\n'
+                     '{\n'
+                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
+                     '  _ExtendedGDBusMethodInfo *info;\n'
+                     '  GVariantIter iter;\n'
+                     '  GVariant *child;\n'
+                     '  GValue *paramv;\n'
+                     '  guint num_params;\n'
+                     '  guint n;\n'
+                     '  guint signal_id;\n'
+                     '  GValue return_value = {0};\n'
+                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
+        self.c.write('  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);\n'
+                     '  g_assert (info != NULL);\n'
+                     %())
+        self.c.write ('  num_params = g_variant_n_children (parameters);\n'
+                      '  paramv = g_new0 (GValue, num_params + 2);\n'
+                      '  g_value_init (&paramv[0], %sTYPE_%s);\n'
+                      '  g_value_set_object (&paramv[0], skeleton);\n'
+                      '  g_value_init (&paramv[1], G_TYPE_DBUS_METHOD_INVOCATION);\n'
+                      '  g_value_set_object (&paramv[1], invocation);\n'
+                      %(i.ns_upper, i.name_upper))
+        self.c.write('  g_variant_iter_init (&iter, parameters);\n'
+                     '  n = 2;\n'
+                     '  while ((child = g_variant_iter_next_value (&iter)) != NULL)\n'
+                     '    {\n'
+                     '      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - 2];\n'
+                     '      if (arg_info->use_gvariant)\n'
+                     '        {\n'
+                     '          g_value_init (&paramv[n], G_TYPE_VARIANT);\n'
+                     '          g_value_set_variant (&paramv[n], child);\n'
+                     '          n++;\n'
+                     '        }\n'
+                     '      else\n'
+                     '        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);\n'
+                     '      g_variant_unref (child);\n'
+                     '    }\n'
+                     )
+        self.c.write('  signal_id = g_signal_lookup (info->signal_name, %sTYPE_%s);\n'
+                     %(i.ns_upper, i.name_upper))
+        self.c.write('  g_value_init (&return_value, G_TYPE_BOOLEAN);\n'
+                     '  g_signal_emitv (paramv, signal_id, 0, &return_value);\n'
+                     '  if (!g_value_get_boolean (&return_value))\n'
+                     '    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);\n'
+                     '  g_value_unset (&return_value);\n'
+                     )
+        self.c.write('  for (n = 0; n < num_params + 2; n++)\n'
+                     '    g_value_unset (&paramv[n]);\n'
+                     '  g_free (paramv);\n')
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write('static GVariant *\n'
+                     '_%s_skeleton_handle_get_property (\n'
+                     '  GDBusConnection *connection,\n'
+                     '  const gchar *sender,\n'
+                     '  const gchar *object_path,\n'
+                     '  const gchar *interface_name,\n'
+                     '  const gchar *property_name,\n'
+                     '  GError **error,\n'
+                     '  gpointer user_data)\n'
+                     '{\n'
+                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
+                     '  GValue value = {0};\n'
+                     '  GParamSpec *pspec;\n'
+                     '  _ExtendedGDBusPropertyInfo *info;\n'
+                     '  GVariant *ret;\n'
+                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
+        self.c.write('  ret = NULL;\n'
+                     '  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, property_name);\n'
+                     '  g_assert (info != NULL);\n'
+                     '  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);\n'
+                     '  if (pspec == NULL)\n'
+                     '    {\n'
+                     '      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %%s", property_name);\n'
+                     '    }\n'
+                     '  else\n'
+                     '    {\n'
+                     '      g_value_init (&value, pspec->value_type);\n'
+                     '      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);\n'
+                     '      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));\n'
+                     '      g_value_unset (&value);\n'
+                     '    }\n'
+                     '  return ret;\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower))
+
+        self.c.write('static gboolean\n'
+                     '_%s_skeleton_handle_set_property (\n'
+                     '  GDBusConnection *connection,\n'
+                     '  const gchar *sender,\n'
+                     '  const gchar *object_path,\n'
+                     '  const gchar *interface_name,\n'
+                     '  const gchar *property_name,\n'
+                     '  GVariant *variant,\n'
+                     '  GError **error,\n'
+                     '  gpointer user_data)\n'
+                     '{\n'
+                     '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
+                     '  GValue value = {0};\n'
+                     '  GParamSpec *pspec;\n'
+                     '  _ExtendedGDBusPropertyInfo *info;\n'
+                     '  gboolean ret;\n'
+                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
+        self.c.write('  ret = FALSE;\n'
+                     '  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_%s_interface_info, property_name);\n'
+                     '  g_assert (info != NULL);\n'
+                     '  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);\n'
+                     '  if (pspec == NULL)\n'
+                     '    {\n'
+                     '      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %%s", property_name);\n'
+                     '    }\n'
+                     '  else\n'
+                     '    {\n'
+                     '      if (info->use_gvariant)\n'
+                     '        g_value_set_variant (&value, variant);\n'
+                     '      else\n'
+                     '        g_dbus_gvariant_to_gvalue (variant, &value);\n'
+                     '      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);\n'
+                     '      g_value_unset (&value);\n'
+                     '      ret = TRUE;\n'
+                     '    }\n'
+                     '  return ret;\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower))
+
+
+        self.c.write('static const GDBusInterfaceVTable _%s_skeleton_vtable =\n'
+                     '{\n'
+                     '  _%s_skeleton_handle_method_call,\n'
+                     '  _%s_skeleton_handle_get_property,\n'
+                     '  _%s_skeleton_handle_set_property\n'
+                     '};\n'
+                     '\n'%(i.name_lower, i.name_lower, i.name_lower, i.name_lower))
+
+        self.c.write('static GDBusInterfaceInfo *\n'
+                     '%s_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)\n'
+                     '{\n'
+                     '  return %s_interface_info ();\n'
+                     %(i.name_lower, i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write('static GDBusInterfaceVTable *\n'
+                     '%s_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)\n'
+                     '{\n'
+                     '  return (GDBusInterfaceVTable *) &_%s_skeleton_vtable;\n'
+                     %(i.name_lower, i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write('static GVariant *\n'
+                     '%s_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)\n'
+                     '{\n'
+                     '  %sSkeleton *skeleton = %s%s_SKELETON (_skeleton);\n'
+                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
+        self.c.write('\n'
+                     '  GVariantBuilder builder;\n'
+                     '  guint n;\n'
+                     '  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));\n'
+                     '  if (_%s_interface_info.parent_struct.properties == NULL)\n'
+                     '    goto out;\n'
+                     '  for (n = 0; _%s_interface_info.parent_struct.properties[n] != NULL; n++)\n'
+                     '    {\n'
+                     '      GDBusPropertyInfo *info = _%s_interface_info.parent_struct.properties[n];\n'
+                     '      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)\n'
+                     '        {\n'
+                     '          GVariant *value;\n'
+                     '          value = _%s_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "%s", info->name, NULL, skeleton);\n'
+                     '          if (value != NULL)\n'
+                     '            {\n'
+                     '              if (g_variant_is_floating (value))\n'
+                     '                g_variant_ref_sink (value);\n'
+                     '              g_variant_builder_add (&builder, "{sv}", info->name, value);\n'
+                     '              g_variant_unref (value);\n'
+                     '            }\n'
+                     '        }\n'
+                     '    }\n'
+                     'out:\n'
+                     '  return g_variant_builder_end (&builder);\n'
+                     '}\n'
+                     '\n'
+                     %(i.name_lower, i.name_lower, i.name_lower, i.name_lower, i.name))
+
+        if len(i.properties) > 0:
+            self.c.write('static gboolean _%s_emit_changed (gpointer user_data);\n'
+                         '\n'
+                         %(i.name_lower))
+
+        self.c.write('static void\n'
+                     '%s_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)\n'
+                     '{\n'
+                     %(i.name_lower))
+        if len(i.properties) > 0:
+            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (_skeleton);\n'
+                         '  gboolean emit_changed = FALSE;\n'
+                         '\n'
+                         '  g_mutex_lock (skeleton->priv->lock);\n'
+                         '  if (skeleton->priv->changed_properties_idle_source != NULL)\n'
+                         '    {\n'
+                         '      g_source_destroy (skeleton->priv->changed_properties_idle_source);\n'
+                         '      skeleton->priv->changed_properties_idle_source = NULL;\n'
+                         '      emit_changed = TRUE;\n'
+                         '    }\n'
+                         '  g_mutex_unlock (skeleton->priv->lock);\n'
+                         '\n'
+                         '  if (emit_changed)\n'
+                         '    _%s_emit_changed (skeleton);\n'
+                         %(i.camel_name, i.ns_upper, i.name_upper, i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        for s in i.signals:
+            self.c.write('static void\n'
+                         '_%s_on_signal_%s (\n'
+                         '    %s *object'%(i.name_lower, s.name_lower, i.camel_name))
+            for a in s.args:
+                self.c.write(',\n    %s%s'%(a.ctype_in, a.name))
+            self.c.write(')\n'
+                         '{\n'
+                         '  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
+                         '  GDBusConnection *connection = g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton));\n'
+                         %(i.camel_name, i.ns_upper, i.name_upper))
+            self.c.write('  if (connection == NULL)\n'
+                         '    return;\n'
+                         '  g_dbus_connection_emit_signal (connection,\n'
+                         '    NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "%s", "%s",\n'
+                         '    g_variant_new ("('
+                         %(i.name, s.name))
+            for a in s.args:
+                self.c.write('%s'%(a.format_in))
+            self.c.write(')"')
+            for a in s.args:
+                self.c.write(',\n                   %s'%(a.name))
+            self.c.write('), NULL);\n')
+            self.c.write('}\n'
+                         '\n')
+
+        self.c.write('static void\n'
+                     '%s_skeleton_iface_init (%sIface *iface)\n'
+                     '{\n'
+                     %(i.name_lower, i.camel_name))
+        for s in i.signals:
+            self.c.write('  iface->%s = _%s_on_signal_%s;\n'
+                         %(s.name_lower, i.name_lower, s.name_lower))
+        self.c.write('}\n'
+                     '\n')
+        self.c.write('#define %s_skeleton_get_type %s_skeleton_get_type\n'%(i.name_lower, i.name_lower))
+        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sSkeleton, %s_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,\n'%(i.camel_name, i.name_lower))
+        self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init));\n'%(i.ns_upper, i.name_upper, i.name_lower))
+        self.c.write('#undef %s_skeleton_get_type\n'
+                     '\n'%(i.name_lower))
+
+        # finalize
+        self.c.write('static void\n'
+                     '%s_skeleton_finalize (GObject *object)\n'
+                     '{\n'%(i.name_lower))
+        self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'%(i.camel_name, i.ns_upper, i.name_upper))
+        if len(i.properties) > 0:
+            self.c.write('  g_value_array_free (skeleton->priv->properties);\n')
+        self.c.write('  g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);\n')
+        self.c.write('  g_list_free (skeleton->priv->changed_properties);\n')
+        self.c.write('  if (skeleton->priv->changed_properties_idle_source != NULL)\n')
+        self.c.write('    g_source_destroy (skeleton->priv->changed_properties_idle_source);\n')
+        self.c.write('  if (skeleton->priv->context != NULL)\n')
+        self.c.write('    g_main_context_unref (skeleton->priv->context);\n')
+        self.c.write('  g_mutex_free (skeleton->priv->lock);\n')
+        self.c.write('  G_OBJECT_CLASS (%s_skeleton_parent_class)->finalize (object);\n'
+                     '}\n'
+                     '\n'%(i.name_lower))
+
+        # property accessors (TODO: generate PropertiesChanged signals in setter)
+        if len(i.properties) > 0:
+            self.c.write('static void\n'
+                         '%s_skeleton_get_property (GObject      *object,\n'
+                         '  guint         prop_id,\n'
+                         '  GValue       *value,\n'
+                         '  GParamSpec   *pspec)\n'
+                         '{\n'%(i.name_lower))
+            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
+                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
+                         '  g_mutex_lock (skeleton->priv->lock);\n'
+                         '  g_value_copy (&skeleton->priv->properties->values[prop_id - 1], value);\n'
+                         '  g_mutex_unlock (skeleton->priv->lock);\n'
+                         %(i.camel_name, i.ns_upper, i.name_upper, len(i.properties)))
+            self.c.write('}\n'
+                         '\n')
+
+            # if property is already scheduled then re-use entry.. though it could be
+            # that the user did
+            #
+            #  foo_set_prop_bar (object, "");
+            #  foo_set_prop_bar (object, "blah");
+            #
+            # say, every update... In this case, where nothing happens, we obviously
+            # don't want a PropertiesChanged() event. We can easily check for this
+            # by comparing against the _original value_ recorded before the first
+            # change event. If the latest value is not different from the original
+            # one, we can simply ignore the ChangedProperty
+            #
+            self.c.write('static gboolean\n'
+                         '_%s_emit_changed (gpointer user_data)\n'
+                         '{\n'
+                         '  %sSkeleton *skeleton = %s%s_SKELETON (user_data);\n'
+                         %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper))
+            self.c.write('  GList *l;\n'
+                         '  GVariantBuilder builder;\n'
+                         '  GVariantBuilder invalidated_builder;\n'
+                         '  guint num_changes;\n'
+                         '\n'
+                         '  g_mutex_lock (skeleton->priv->lock);\n'
+                         '  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));\n'
+                         '  g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));\n'
+                         '  for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)\n'
+                         '    {\n'
+                         '      ChangedProperty *cp = l->data;\n'
+                         '      GVariant *variant;\n'
+                         '      const GValue *cur_value;\n'
+                         '\n'
+                         '      cur_value = &skeleton->priv->properties->values[cp->prop_id - 1];\n'
+                         '      if (!_g_value_equal (cur_value, &cp->orig_value))\n'
+                         '        {\n'
+                         '          variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));\n'
+                         '          g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);\n'
+                         '          g_variant_unref (variant);\n'
+                         '          num_changes++;\n'
+                         '        }\n'
+                         '    }\n'
+                         '  if (num_changes > 0)\n'
+                         '    {\n'
+                         '      g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)),\n'
+                         '                                     NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),\n'
+                         '                                     "org.freedesktop.DBus.Properties",\n'
+                         '                                     "PropertiesChanged",\n'
+                         '                                     g_variant_new ("(sa{sv}as)",\n'
+                         '                                                    "%s",\n'
+                         '                                                    &builder, &invalidated_builder),\n'
+                         '                                     NULL);\n'
+                         '    }\n'
+                         '  else\n'
+                         '    {\n'
+                         '      g_variant_builder_clear (&builder);\n'
+                         '      g_variant_builder_clear (&invalidated_builder);\n'
+                         '    }\n'
+                         %(i.name))
+            self.c.write('  g_list_foreach (skeleton->priv->changed_properties, (GFunc) _changed_property_free, NULL);\n')
+            self.c.write('  g_list_free (skeleton->priv->changed_properties);\n')
+            self.c.write('  skeleton->priv->changed_properties = NULL;\n')
+            self.c.write('  skeleton->priv->changed_properties_idle_source = NULL;\n')
+            self.c.write('  g_mutex_unlock (skeleton->priv->lock);\n')
+            self.c.write('  return FALSE;\n'
+                         '}\n'
+                         '\n')
+            # holding lock while being called
+            self.c.write('static void\n'
+                         '_%s_schedule_emit_changed (%sSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)\n'
+                         '{\n'
+                         '  ChangedProperty *cp;\n'
+                         '  GList *l;\n'
+                         '  cp = NULL;\n'
+                         '  for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)\n'
+                         '    {\n'
+                         '      ChangedProperty *i_cp = l->data;\n'
+                         '      if (i_cp->info == info)\n'
+                         '        {\n'
+                         '          cp = i_cp;\n'
+                         '          break;\n'
+                         '        }\n'
+                         '    }\n'
+                         %(i.name_lower, i.camel_name))
+            self.c.write('  if (cp == NULL)\n'
+                         '    {\n'
+                         '      cp = g_new0 (ChangedProperty, 1);\n'
+                         '      cp->prop_id = prop_id;\n'
+                         '      cp->info = info;\n'
+                         '      skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);\n'
+                         '      g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));\n'
+                         '      g_value_copy (orig_value, &cp->orig_value);\n'
+                         '    }\n'
+                         '}\n'
+                         '\n'
+                         %())
+
+            # Postpone setting up the refresh source until the ::notify signal is emitted as
+            # this allows use of g_object_freeze_notify()/g_object_thaw_notify() ...
+            # This is useful when updating several properties from another thread than
+            # where the idle will be emitted from
+            self.c.write('static void\n'
+                         '%s_skeleton_notify (GObject      *object,\n'
+                         '  GParamSpec *pspec)\n'
+                         '{\n'
+                         '  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
+                         '  g_mutex_lock (skeleton->priv->lock);\n'
+                         '  if (skeleton->priv->changed_properties != NULL &&\n'
+                         '      skeleton->priv->changed_properties_idle_source == NULL)\n'
+                         '    {\n'
+                         '      skeleton->priv->changed_properties_idle_source = g_idle_source_new ();\n'
+                         '      g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);\n'
+                         '      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _%s_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);\n'
+                         '      g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);\n'
+                         '      g_source_unref (skeleton->priv->changed_properties_idle_source);\n'
+                         '    }\n'
+                         '  g_mutex_unlock (skeleton->priv->lock);\n'
+                         '}\n'
+                         '\n'
+                         %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper, i.name_lower))
+
+            self.c.write('static void\n'
+                         '%s_skeleton_set_property (GObject      *object,\n'
+                         '  guint         prop_id,\n'
+                         '  const GValue *value,\n'
+                         '  GParamSpec   *pspec)\n'
+                         '{\n'%(i.name_lower))
+            self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
+                         '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
+                         '  g_mutex_lock (skeleton->priv->lock);\n'
+                         '  g_object_freeze_notify (object);\n'
+                         '  if (!_g_value_equal (value, &skeleton->priv->properties->values[prop_id - 1]))\n'
+                         '    {\n'
+                         '      if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)\n'
+                         '        _%s_schedule_emit_changed (skeleton, _%s_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties->values[prop_id - 1]);\n'
+                         '      g_value_copy (value, &skeleton->priv->properties->values[prop_id - 1]);\n'
+                         '      g_object_notify_by_pspec (object, pspec);\n'
+                         '    }\n'
+                         '  g_mutex_unlock (skeleton->priv->lock);\n'
+                         '  g_object_thaw_notify (object);\n'
+                         %(i.camel_name, i.ns_upper, i.name_upper, len(i.properties), i.name_lower, i.name_lower))
+            self.c.write('}\n'
+                         '\n')
+
+        self.c.write('static void\n'
+                     '%s_skeleton_init (%sSkeleton *skeleton)\n'
+                     '{\n'
+                     '  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, %sTYPE_%s_SKELETON, %sSkeletonPrivate);\n'
+                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper, i.camel_name))
+        self.c.write('  skeleton->priv->lock = g_mutex_new ();\n')
+        self.c.write('  skeleton->priv->context = g_main_context_get_thread_default ();\n')
+        self.c.write('  if (skeleton->priv->context != NULL)\n')
+        self.c.write('    g_main_context_ref (skeleton->priv->context);\n')
+        if len(i.properties) > 0:
+            self.c.write('  skeleton->priv->properties = g_value_array_new (%d);\n'%(len(i.properties)))
+            n = 0
+            for p in i.properties:
+                self.c.write('  g_value_array_append (skeleton->priv->properties, NULL);\n')
+                self.c.write('  g_value_init (&skeleton->priv->properties->values[%d], %s);\n'%(n, p.arg.gtype))
+                n += 1
+        self.c.write('}\n'
+                     '\n')
+        self.c.write('static void\n'
+                     '%s_skeleton_class_init (%sSkeletonClass *klass)\n'
+                     '{\n'
+                     '  GObjectClass *gobject_class;\n'
+                     '  GDBusInterfaceSkeletonClass *skeleton_class;\n'
+                     '\n'
+                     '  g_type_class_add_private (klass, sizeof (%sSkeletonPrivate));\n'
+                     '\n'
+                     '  gobject_class = G_OBJECT_CLASS (klass);\n'
+                     '  gobject_class->finalize = %s_skeleton_finalize;\n'
+                     %(i.name_lower, i.camel_name, i.camel_name, i.name_lower))
+        if len(i.properties) > 0:
+            self.c.write('  gobject_class->get_property = %s_skeleton_get_property;\n'
+                         '  gobject_class->set_property = %s_skeleton_set_property;\n'
+                         '  gobject_class->notify       = %s_skeleton_notify;\n'
+                         '\n'%(i.name_lower, i.name_lower, i.name_lower))
+            self.c.write('\n'
+                         '  %s_override_properties (gobject_class, 1);\n'%(i.name_lower))
+        self.c.write('\n'
+                     '  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);\n');
+        self.c.write('  skeleton_class->get_info = %s_skeleton_dbus_interface_get_info;\n'%(i.name_lower))
+        self.c.write('  skeleton_class->get_properties = %s_skeleton_dbus_interface_get_properties;\n'%(i.name_lower))
+        self.c.write('  skeleton_class->flush = %s_skeleton_dbus_interface_flush;\n'%(i.name_lower))
+        self.c.write('  skeleton_class->get_vtable = %s_skeleton_dbus_interface_get_vtable;\n'%(i.name_lower))
+        self.c.write('}\n'
+                     '\n')
+
+        # constructors
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %s_skeleton_new:\n'
+                ' *\n'
+                ' * Creates a skeleton object for the D-Bus interface #%s.\n'
+                ' *\n'
+                ' * Returns: (transfer full) (type %sSkeleton): The skeleton object.\n'
+                %(i.name_lower, i.name, i.camel_name), False))
+        self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+        self.c.write('%s *\n'
+                     '%s_skeleton_new (void)\n'
+                     '{\n'
+                     '  return %s%s (g_object_new (%sTYPE_%s_SKELETON, NULL));\n'
+                     '}\n'
+                     '\n'%(i.camel_name, i.name_lower, i.ns_upper, i.name_upper, i.ns_upper, i.name_upper))
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_object(self):
+        self.c.write('/* ------------------------------------------------------------------------\n'
+                     ' * Code for Object, ObjectProxy and ObjectSkeleton\n'
+                     ' * ------------------------------------------------------------------------\n'
+                     ' */\n'
+                     '\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * SECTION:%sObject\n'
+                ' * @title: %sObject\n'
+                ' * @short_description: Specialized GDBusObject types\n'
+                ' *\n'
+                ' * This section contains the #%sObject, #%sObjectProxy, and #%sObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.\n'
+                ' */\n'
+                %(self.namespace, self.namespace, self.namespace, self.namespace, self.namespace), False))
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObject:\n'
+                ' *\n'
+                ' * The #%sObject type is a specialized container of interfaces.\n'
+                ' */\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectIface:\n'
+                ' * @parent_iface: The parent interface.\n'
+                ' *\n'
+                ' * Virtual table for the #%sObject interface.\n'
+                ' */\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write('\n')
+
+        self.c.write('static void\n'
+                     '%sobject_default_init (%sObjectIface *iface)\n'
+                     '{\n'
+                     %(self.ns_lower, self.namespace));
+        for i in self.ifaces:
+            self.c.write(self.docbook_gen.expand(
+                    '  /**\n'
+                    '   * %sObject:%s:\n'
+                    '   *\n'
+                    '   * The #%s instance corresponding to the D-Bus interface #%s, if any.\n'
+                    '   *\n'
+                    '   * Connect to the #GObject::notify signal to get informed of property changes.\n'
+                    %(self.namespace, i.name_hyphen, i.camel_name, i.name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 2)
+            self.c.write('  g_object_interface_install_property (iface, g_param_spec_object ("%s", "%s", "%s", %sTYPE_%s, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));\n'
+                         '\n'
+                         %(i.name_hyphen, i.name_hyphen, i.name_hyphen, self.ns_upper, i.name_upper))
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write('typedef %sObjectIface %sObjectInterface;\n'%(self.namespace, self.namespace))
+        self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));\n'%(self.namespace, self.ns_lower))
+        self.c.write('\n')
+
+        for i in self.ifaces:
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %sobject_get_%s:\n'
+                    ' * @object: A #%sObject.\n'
+                    ' *\n'
+                    ' * Gets the #%s instance for the D-Bus interface #%s on @object, if any.\n'
+                    ' *\n'
+                    ' * Returns: (transfer full): A #%s that must be freed with g_object_unref() or %%NULL if @object does not implement the interface.\n'
+                    %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name, i.name, i.camel_name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+            self.c.write ('%s *%sobject_get_%s (%sObject *object)\n'
+                          %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
+            self.c.write('{\n'
+                         '  GDBusInterface *ret;\n'
+                         '  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
+                         '  if (ret == NULL)\n'
+                         '    return NULL;\n'
+                         '  return %s%s (ret);\n'
+                         '}\n'
+                         '\n'
+                         %(i.name, self.ns_upper, i.name_upper))
+        self.c.write('\n')
+        for i in self.ifaces:
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %sobject_peek_%s: (skip)\n'
+                    ' * @object: A #%sObject.\n'
+                    ' *\n'
+                    ' * Like %sobject_get_%s() but doesn\' increase the reference count on the returned object.\n'
+                    ' *\n'
+                    ' * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>\n'
+                    ' *\n'
+                    ' * Returns: (transfer none): A #%s or %%NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.\n'
+                    %(self.ns_lower, i.name_upper.lower(), self.namespace, self.ns_lower, i.name_upper.lower(), i.camel_name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+            self.c.write ('%s *%sobject_peek_%s (%sObject *object)\n'
+                          %(i.camel_name, self.ns_lower, i.name_upper.lower(), self.namespace))
+            self.c.write('{\n'
+                         '  GDBusInterface *ret;\n'
+                         '  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
+                         '  if (ret == NULL)\n'
+                         '    return NULL;\n'
+                         '  g_object_unref (ret);\n'
+                         '  return %s%s (ret);\n'
+                         '}\n'
+                         '\n'
+                         %(i.name, self.ns_upper, i.name_upper))
+        self.c.write('\n')
+        # shared by ObjectProxy and ObjectSkeleton classes
+        self.c.write('static void\n'
+                     '%sobject_notify (GDBusObject *object, GDBusInterface *interface)\n'
+                     '{\n'
+                     '  g_object_notify (G_OBJECT (object), ((_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface))->hyphen_name);\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower))
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectProxy:\n'
+                ' *\n'
+                ' * The #%sObjectProxy structure contains only private data and should only be accessed using the provided API.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectProxyClass:\n'
+                ' * @parent_class: The parent class.\n'
+                ' *\n'
+                ' * Class structure for #%sObjectProxy.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%sobject_proxy__%sobject_iface_init (%sObjectIface *iface)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_lower, self.namespace))
+        self.c.write('static void\n'
+                     '%sobject_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)\n'
+                     '{\n'
+                     '  iface->interface_added = %sobject_notify;\n'
+                     '  iface->interface_removed = %sobject_notify;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_lower, self.ns_lower))
+        self.c.write('\n')
+        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectProxy, %sobject_proxy, G_TYPE_DBUS_OBJECT_PROXY,\n'
+                     '                         G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_proxy__%sobject_iface_init)\n'
+                     '                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_proxy__g_dbus_object_iface_init));\n'
+                     '\n'
+                     %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%sobject_proxy_init (%sObjectProxy *object)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'%(self.ns_lower, self.namespace))
+        self.c.write('static void\n'
+                     '%sobject_proxy_set_property (GObject      *_object,\n'
+                     '  guint         prop_id,\n'
+                     '  const GValue *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'
+                     '  G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
+                     %(self.ns_lower))
+        self.c.write('}\n'
+                     '\n'%())
+        self.c.write('static void\n'
+                     '%sobject_proxy_get_property (GObject      *_object,\n'
+                     '  guint         prop_id,\n'
+                     '  GValue       *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'
+                     '  %sObjectProxy *object = %sOBJECT_PROXY (_object);\n'
+                     '  GDBusInterface *interface;\n'
+                     '\n'
+                     '  switch (prop_id)\n'
+                     '    {\n'
+                     %(self.ns_lower, self.namespace, self.ns_upper))
+        n = 1
+        for i in self.ifaces:
+            self.c.write('    case %d:\n'
+                         '      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
+                         '      g_value_take_object (value, interface);\n'
+                         '      break;\n'
+                         '\n'
+                         %(n, i.name))
+            n += 1
+        self.c.write('    default:\n'
+                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
+                     '      break;\n'
+                     '  }\n'
+                     '}\n'
+                     '\n'%())
+        self.c.write('static void\n'
+                     '%sobject_proxy_class_init (%sObjectProxyClass *klass)\n'
+                     '{\n'
+                     '  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);\n'
+                     '\n'
+                     '  gobject_class->set_property = %sobject_proxy_set_property;\n'
+                     '  gobject_class->get_property = %sobject_proxy_get_property;\n'
+                     '\n'
+                     %(self.ns_lower, self.namespace, self.ns_lower, self.ns_lower))
+        n = 1
+        for i in self.ifaces:
+            self.c.write('  g_object_class_override_property (gobject_class, %d, "%s");'
+                         '\n'
+                         %(n, i.name_hyphen))
+            n += 1
+        self.c.write('}\n'
+                     '\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_proxy_new:\n'
+                ' * @connection: A #GDBusConnection.\n'
+                ' * @object_path: An object path.\n'
+                ' *\n'
+                ' * Creates a new proxy object.\n'
+                ' *\n'
+                ' * Returns: (transfer full): The proxy object.\n'
+                ' */\n'
+                %(self.ns_lower), False))
+        self.c.write('%sObjectProxy *\n'
+                     '%sobject_proxy_new (GDBusConnection *connection,\n'
+                     '  const gchar *object_path)\n'
+                     '{\n'
+                     '  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);\n'
+                     '  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n'
+                     '  return %sOBJECT_PROXY (g_object_new (%sTYPE_OBJECT_PROXY, "connection", connection, "object-path", object_path, NULL));\n'
+                     '}\n'
+                     '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper))
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectSkeleton:\n'
+                ' *\n'
+                ' * The #%sObjectSkeleton structure contains only private data and should only be accessed using the provided API.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectSkeletonClass:\n'
+                ' * @parent_class: The parent class.\n'
+                ' *\n'
+                ' * Class structure for #%sObjectSkeleton.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%sobject_skeleton__%sobject_iface_init (%sObjectIface *iface)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_lower, self.namespace))
+        self.c.write('\n')
+        self.c.write('static void\n'
+                     '%sobject_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)\n'
+                     '{\n'
+                     '  iface->interface_added = %sobject_notify;\n'
+                     '  iface->interface_removed = %sobject_notify;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_lower, self.ns_lower))
+        self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectSkeleton, %sobject_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,\n'
+                     '                         G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_skeleton__%sobject_iface_init)\n'
+                     '                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_skeleton__g_dbus_object_iface_init));\n'
+                     '\n'
+                     %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%sobject_skeleton_init (%sObjectSkeleton *object)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'%(self.ns_lower, self.namespace))
+        self.c.write('static void\n'
+                     '%sobject_skeleton_set_property (GObject      *_object,\n'
+                     '  guint         prop_id,\n'
+                     '  const GValue *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'
+                     '  %sObjectSkeleton *object = %sOBJECT_SKELETON (_object);\n'
+                     '  GDBusInterfaceSkeleton *interface;\n'
+                     '\n'
+                     '  switch (prop_id)\n'
+                     '    {\n'
+                     %(self.ns_lower, self.namespace, self.ns_upper))
+        n = 1
+        for i in self.ifaces:
+            self.c.write('    case %d:\n'
+                         '      interface = g_value_get_object (value);\n'
+                         '      if (interface != NULL)\n'
+                         '        {\n'
+                         '          g_warn_if_fail (%sIS_%s (interface));\n'
+                         '          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);\n'
+                         '        }\n'
+                         '      else\n'
+                         '        {\n'
+                         '          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "%s");\n'
+                         '        }\n'
+                         '      break;\n'
+                         '\n'
+                         %(n, self.ns_upper, i.name_upper, i.name))
+            n += 1
+        self.c.write('    default:\n'
+                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
+                     '      break;\n'
+                     '  }\n'
+                     '}\n'
+                     '\n'%())
+        self.c.write('static void\n'
+                     '%sobject_skeleton_get_property (GObject      *_object,\n'
+                     '  guint         prop_id,\n'
+                     '  GValue       *value,\n'
+                     '  GParamSpec   *pspec)\n'
+                     '{\n'
+                     '  %sObjectSkeleton *object = %sOBJECT_SKELETON (_object);\n'
+                     '  GDBusInterface *interface;\n'
+                     '\n'
+                     '  switch (prop_id)\n'
+                     '    {\n'
+                     %(self.ns_lower, self.namespace, self.ns_upper))
+        n = 1
+        for i in self.ifaces:
+            self.c.write('    case %d:\n'
+                         '      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "%s");\n'
+                         '      g_value_take_object (value, interface);\n'
+                         '      break;\n'
+                         '\n'
+                         %(n, i.name))
+            n += 1
+        self.c.write('    default:\n'
+                     '      G_OBJECT_WARN_INVALID_PROPERTY_ID (_object, prop_id, pspec);\n'
+                     '      break;\n'
+                     '  }\n'
+                     '}\n'
+                     '\n'%())
+        self.c.write('static void\n'
+                     '%sobject_skeleton_class_init (%sObjectSkeletonClass *klass)\n'
+                     '{\n'
+                     '  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);\n'
+                     '\n'
+                     '  gobject_class->set_property = %sobject_skeleton_set_property;\n'
+                     '  gobject_class->get_property = %sobject_skeleton_get_property;\n'
+                     '\n'
+                     %(self.ns_lower, self.namespace, self.ns_lower, self.ns_lower))
+        n = 1
+        for i in self.ifaces:
+            self.c.write('  g_object_class_override_property (gobject_class, %d, "%s");'
+                         '\n'
+                         %(n, i.name_hyphen))
+            n += 1
+        self.c.write('}\n'
+                     '\n')
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_skeleton_new:\n'
+                ' * @object_path: An object path.\n'
+                ' *\n'
+                ' * Creates a new skeleton object.\n'
+                ' *\n'
+                ' * Returns: (transfer full): The skeleton object.\n'
+                ' */\n'
+                %(self.ns_lower), False))
+        self.c.write('%sObjectSkeleton *\n'
+                     '%sobject_skeleton_new (const gchar *object_path)\n'
+                     '{\n'
+                     '  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n'
+                     '  return %sOBJECT_SKELETON (g_object_new (%sTYPE_OBJECT_SKELETON, "object-path", object_path, NULL));\n'
+                     '}\n'
+                     '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper))
+        for i in self.ifaces:
+            self.c.write(self.docbook_gen.expand(
+                    '/**\n'
+                    ' * %sobject_skeleton_set_%s:\n'
+                    ' * @object: A #%sObjectSkeleton.\n'
+                    ' * @interface_: (allow-none): A #%s or %%NULL to clear the interface.\n'
+                    ' *\n'
+                    ' * Sets the #%s instance for the D-Bus interface #%s on @object.\n'
+                    %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name, i.camel_name, i.name), False))
+            self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
+            self.c.write ('void %sobject_skeleton_set_%s (%sObjectSkeleton *object, %s *interface_)\n'
+                          %(self.ns_lower, i.name_upper.lower(), self.namespace, i.camel_name))
+            self.c.write('{\n'
+                         '  g_object_set (G_OBJECT (object), "%s", interface_, NULL);\n'
+                         '}\n'
+                         '\n'
+                         %(i.name_hyphen))
+        self.c.write('\n')
+
+
+    def generate_object_manager_client(self):
+        self.c.write('/* ------------------------------------------------------------------------\n'
+                     ' * Code for ObjectManager client\n'
+                     ' * ------------------------------------------------------------------------\n'
+                     ' */\n'
+                     '\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * SECTION:%sObjectManagerClient\n'
+                ' * @title: %sObjectManagerClient\n'
+                ' * @short_description: Generated GDBusObjectManagerClient type\n'
+                ' *\n'
+                ' * This section contains a #GDBusObjectManagerClient that uses %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.\n'
+                ' */\n'
+                %(self.namespace, self.namespace, self.ns_lower), False))
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectManagerClient:\n'
+                ' *\n'
+                ' * The #%sObjectManagerClient structure contains only private data and should only be accessed using the provided API.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sObjectManagerClientClass:\n'
+                ' * @parent_class: The parent class.\n'
+                ' *\n'
+                ' * Class structure for #%sObjectManagerClient.\n'
+                %(self.namespace, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('\n')
+
+        # class boilerplate
+        self.c.write('G_DEFINE_TYPE (%sObjectManagerClient, %sobject_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);\n'
+                     '\n'
+                     %(self.namespace, self.ns_lower))
+
+        # class boilerplate
+        self.c.write('static void\n'
+                     '%sobject_manager_client_init (%sObjectManagerClient *manager)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'%(self.ns_lower, self.namespace))
+        self.c.write('static void\n'
+                     '%sobject_manager_client_class_init (%sObjectManagerClientClass *klass)\n'
+                     '{\n'
+                     '}\n'
+                     '\n'%(self.ns_lower, self.namespace))
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_manager_client_get_proxy_type:\n'
+                ' * @manager: A #GDBusObjectManagerClient.\n'
+                ' * @object_path: The object path of the remote object (unused).\n'
+                ' * @interface_name: (allow-none): Interface name of the remote object or %%NULL to get the object proxy #GType.\n'
+                ' * @user_data: User data (unused).\n'
+                ' *\n'
+                ' * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.\n'
+                ' *\n'
+                ' * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %%NULL, otherwise the #GType for #%sObjectProxy.\n'
+                %(self.ns_lower, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('GType\n'
+                     '%sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data)\n'
+                     '{\n'
+                     %(self.ns_lower))
+        self.c.write('  static gsize once_init_value = 0;\n'
+                     '  static GHashTable *lookup_hash;\n'
+                     '  GType ret;\n'
+                     '\n'
+                     '  if (interface_name == NULL)\n'
+                     '    return %sTYPE_OBJECT_PROXY;\n'
+                     '  if (g_once_init_enter (&once_init_value))\n'
+                     '    {\n'
+                     '      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);\n'
+                     %(self.ns_upper))
+        for i in self.ifaces:
+            self.c.write('      g_hash_table_insert (lookup_hash, "%s", GSIZE_TO_POINTER (%sTYPE_%s_PROXY));\n'
+                         %(i.name, i.ns_upper, i.name_upper))
+        self.c.write('      g_once_init_leave (&once_init_value, 1);\n'
+                     '    }\n')
+        self.c.write('  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));\n'
+                     '  if (ret == (GType) 0)\n'
+                     '    ret = G_TYPE_DBUS_PROXY;\n')
+        self.c.write('  return ret;\n'
+                     '}\n'
+                     '\n')
+
+        # constructors
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_manager_client_new:\n'
+                ' * @connection: A #GDBusConnection.\n'
+                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
+                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
+                ' * @user_data: User data to pass to @callback.\n'
+                ' *\n'
+                ' * Asynchronously creates #GDBusObjectManagerClient using %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.\n'
+                ' *\n'
+                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
+                ' * You can then call %sobject_manager_client_new_finish() to get the result of the operation.\n'
+                ' *\n'
+                ' * See %sobject_manager_client_new_sync() for the synchronous, blocking version of this constructor.\n'
+                %(self.ns_lower, self.ns_lower, self.ns_lower, self.ns_lower), False))
+        self.c.write(' */\n')
+        self.c.write('void\n'
+                     '%sobject_manager_client_new (\n'
+                     '    GDBusConnection        *connection,\n'
+                     '    GDBusObjectManagerClientFlags  flags,\n'
+                     '    const gchar            *name,\n'
+                     '    const gchar            *object_path,\n'
+                     '    GCancellable           *cancellable,\n'
+                     '    GAsyncReadyCallback     callback,\n'
+                     '    gpointer                user_data)\n'
+                     '{\n'
+                     '  g_async_initable_new_async (%sTYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_upper, self.ns_lower))
+        self.c.write('/**\n'
+                     ' * %sobject_manager_client_new_finish:\n'
+                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %sobject_manager_client_new().\n'
+                     ' * @error: Return location for error or %%NULL\n'
+                     ' *\n'
+                     ' * Finishes an operation started with %sobject_manager_client_new().\n'
+                     ' *\n'
+                     ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
+                     %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace))
+        self.c.write(' */\n')
+        self.c.write('GDBusObjectManager *\n'
+                     '%sobject_manager_client_new_finish (\n'
+                     '    GAsyncResult        *res,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GObject *ret;\n'
+                     '  GObject *source_object;\n'
+                     '  source_object = g_async_result_get_source_object (res);\n'
+                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
+                     '  g_object_unref (source_object);\n'
+                     '  if (ret != NULL)\n'
+                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower))
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_manager_client_new_sync:\n'
+                ' * @connection: A #GDBusConnection.\n'
+                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
+                ' * @name: (allow-none): A bus name (well-known or unique) or %%NULL if @connection is not a message bus connection.\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @error: Return location for error or %%NULL\n'
+                ' *\n'
+                ' * Synchronously creates #GDBusObjectManagerClient using %sobject_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.\n'
+                ' *\n'
+                ' * The calling thread is blocked until a reply is received.\n'
+                ' *\n'
+                ' * See %sobject_manager_client_new() for the asynchronous version of this constructor.\n'
+                ' *\n'
+                ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
+                %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('GDBusObjectManager *\n'
+                     '%sobject_manager_client_new_sync (\n'
+                     '    GDBusConnection        *connection,\n'
+                     '    GDBusObjectManagerClientFlags  flags,\n'
+                     '    const gchar            *name,\n'
+                     '    const gchar            *object_path,\n'
+                     '    GCancellable           *cancellable,\n'
+                     '    GError                **error)\n'
+                     '{\n'
+                     '  GInitable *ret;\n'
+                     '  ret = g_initable_new (%sTYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
+                     '  if (ret != NULL)\n'
+                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_upper, self.ns_lower))
+        self.c.write('\n')
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_manager_client_new_for_bus:\n'
+                ' * @bus_type: A #GBusType.\n'
+                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
+                ' * @name: A bus name (well-known or unique).\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @callback: A #GAsyncReadyCallback to call when the request is satisfied.\n'
+                ' * @user_data: User data to pass to @callback.\n'
+                ' *\n'
+                ' * Like %sobject_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.\n'
+                ' *\n'
+                ' * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.\n'
+                ' * You can then call %sobject_manager_client_new_for_bus_finish() to get the result of the operation.\n'
+                ' *\n'
+                ' * See %sobject_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.\n'
+                %(self.ns_lower, self.ns_lower, self.ns_lower, self.ns_lower), False))
+        self.c.write(' */\n')
+        self.c.write('void\n'
+                     '%sobject_manager_client_new_for_bus (\n'
+                     '    GBusType                bus_type,\n'
+                     '    GDBusObjectManagerClientFlags  flags,\n'
+                     '    const gchar            *name,\n'
+                     '    const gchar            *object_path,\n'
+                     '    GCancellable           *cancellable,\n'
+                     '    GAsyncReadyCallback     callback,\n'
+                     '    gpointer                user_data)\n'
+                     '{\n'
+                     '  g_async_initable_new_async (%sTYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_upper, self.ns_lower))
+        self.c.write('/**\n'
+                     ' * %sobject_manager_client_new_for_bus_finish:\n'
+                     ' * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to %sobject_manager_client_new_for_bus().\n'
+                     ' * @error: Return location for error or %%NULL\n'
+                     ' *\n'
+                     ' * Finishes an operation started with %sobject_manager_client_new_for_bus().\n'
+                     ' *\n'
+                     ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
+                     %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace))
+        self.c.write(' */\n')
+        self.c.write('GDBusObjectManager *\n'
+                     '%sobject_manager_client_new_for_bus_finish (\n'
+                     '    GAsyncResult        *res,\n'
+                     '    GError             **error)\n'
+                     '{\n'
+                     '  GObject *ret;\n'
+                     '  GObject *source_object;\n'
+                     '  source_object = g_async_result_get_source_object (res);\n'
+                     '  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);\n'
+                     '  g_object_unref (source_object);\n'
+                     '  if (ret != NULL)\n'
+                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower))
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * %sobject_manager_client_new_for_bus_sync:\n'
+                ' * @bus_type: A #GBusType.\n'
+                ' * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.\n'
+                ' * @name: A bus name (well-known or unique).\n'
+                ' * @object_path: An object path.\n'
+                ' * @cancellable: (allow-none): A #GCancellable or %%NULL.\n'
+                ' * @error: Return location for error or %%NULL\n'
+                ' *\n'
+                ' * Like %sobject_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.\n'
+                ' *\n'
+                ' * The calling thread is blocked until a reply is received.\n'
+                ' *\n'
+                ' * See %sobject_manager_client_new_for_bus() for the asynchronous version of this constructor.\n'
+                ' *\n'
+                ' * Returns: (transfer full) (type %sObjectManagerClient): The constructed object manager client or %%NULL if @error is set.\n'
+                %(self.ns_lower, self.ns_lower, self.ns_lower, self.namespace), False))
+        self.c.write(' */\n')
+        self.c.write('GDBusObjectManager *\n'
+                     '%sobject_manager_client_new_for_bus_sync (\n'
+                     '    GBusType                bus_type,\n'
+                     '    GDBusObjectManagerClientFlags  flags,\n'
+                     '    const gchar            *name,\n'
+                     '    const gchar            *object_path,\n'
+                     '    GCancellable           *cancellable,\n'
+                     '    GError                **error)\n'
+                     '{\n'
+                     '  GInitable *ret;\n'
+                     '  ret = g_initable_new (%sTYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", %sobject_manager_client_get_proxy_type, NULL);\n'
+                     '  if (ret != NULL)\n'
+                     '    return G_DBUS_OBJECT_MANAGER (ret);\n'
+                     '  else\n'
+                     '    return NULL;\n'
+                     '}\n'
+                     '\n'
+                     %(self.ns_lower, self.ns_upper, self.ns_lower))
+        self.c.write('\n')
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def write_gtkdoc_deprecated_and_since_and_close(self, obj, f, indent):
+        if len(obj.since) > 0:
+            f.write('%*s *\n'
+                    '%*s * Since: %s\n'
+                    %(indent, '', indent, '', obj.since))
+        if obj.deprecated:
+            if isinstance(obj, dbustypes.Interface):
+                thing = 'The D-Bus interface'
+            elif isinstance(obj, dbustypes.Method):
+                thing = 'The D-Bus method'
+            elif isinstance(obj, dbustypes.Signal):
+                thing = 'The D-Bus signal'
+            elif isinstance(obj, dbustypes.Property):
+                thing = 'The D-Bus property'
+            else:
+                raise RuntimeError('Cannot handle object ', obj)
+            f.write(self.docbook_gen.expand(
+                    '%*s *\n'
+                    '%*s * Deprecated: %s has been deprecated.\n'
+                    %(indent, '', indent, '', thing), False))
+        f.write('%*s */\n'%(indent, ''))
+
+    # ---------------------------------------------------------------------------------------------------
+
+    def generate_interface_intro(self, i):
+        self.c.write('/* ------------------------------------------------------------------------\n'
+                     ' * Code for interface %s\n'
+                     ' * ------------------------------------------------------------------------\n'
+                     ' */\n'
+                     '\n'%(i.name))
+
+        self.c.write(self.docbook_gen.expand(
+                '/**\n'
+                ' * SECTION:%s\n'
+                ' * @title: %s\n'
+                ' * @short_description: Generated C code for the %s D-Bus interface\n'
+                ' *\n'
+                ' * This section contains code for working with the #%s D-Bus interface in C.\n'
+                ' */\n'
+                %(i.camel_name, i.camel_name, i.name, i.name), False))
+        self.c.write('\n')
+
+    def generate(self):
+        self.generate_intro()
+        self.declare_types()
+        for i in self.ifaces:
+            self.generate_interface_intro(i)
+            self.generate_introspection_for_interface(i)
+            self.generate_interface(i)
+            self.generate_property_accessors(i)
+            self.generate_signal_emitters(i)
+            self.generate_method_calls(i)
+            self.generate_method_completers(i)
+            self.generate_proxy(i)
+            self.generate_skeleton(i)
+        if self.generate_objmanager:
+            self.generate_object()
+            self.generate_object_manager_client()
+        self.generate_outro()
diff --git a/gio/gdbus/codegen/codegen_docbook.py b/gio/gdbus/codegen/codegen_docbook.py
new file mode 100644
index 0000000..a2fb118
--- /dev/null
+++ b/gio/gdbus/codegen/codegen_docbook.py
@@ -0,0 +1,325 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+import sys
+import re
+
+import config
+from . import utils
+from . import dbustypes
+from . import parser
+
+# ----------------------------------------------------------------------------------------------------
+
+class DocbookCodeGenerator:
+    def __init__(self, ifaces, docbook):
+        self.ifaces = ifaces
+        self.docbook = docbook
+        self.generate_expand_dicts()
+
+    def print_method_prototype(self, i, m, in_synopsis):
+        max_method_len = 0
+        if in_synopsis:
+            for _m in i.methods:
+                max_method_len = max(len(_m.name), max_method_len)
+        else:
+            max_method_len = max(len(m.name), max_method_len)
+
+        max_signature_len = 0
+        if in_synopsis:
+            for _m in i.methods:
+                for a in _m.in_args:
+                    max_signature_len = max(len(a.signature), max_signature_len)
+                for a in _m.out_args:
+                    max_signature_len = max(len(a.signature), max_signature_len)
+        else:
+            for a in m.in_args:
+                max_signature_len = max(len(a.signature), max_signature_len)
+            for a in m.out_args:
+                max_signature_len = max(len(a.signature), max_signature_len)
+
+        if in_synopsis:
+            self.out.write('<link linkend="gdbus-method-%s.%s">%s</link>%*s ('
+                           %(utils.dots_to_hyphens(i.name), m.name, m.name, max_method_len - len(m.name), ''))
+        else:
+            self.out.write('%s%*s ('
+                           %(m.name, max_method_len - len(m.name), ''))
+        count = 0
+        for a in m.in_args:
+            if (count > 0):
+                self.out.write(',\n%*s'%(max_method_len + 2, ''))
+            self.out.write('IN  %s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
+            count = count + 1
+        for a in m.out_args:
+            if (count > 0):
+                self.out.write(',\n%*s'%(max_method_len + 2, ''))
+            self.out.write('OUT %s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
+            count = count + 1
+        self.out.write(');\n')
+
+    def print_signal_prototype(self, i, s, in_synopsis):
+        max_signal_len = 0
+        if in_synopsis:
+            for _s in i.signals:
+                max_signal_len = max(len(_s.name), max_signal_len)
+        else:
+            max_signal_len = max(len(s.name), max_signal_len)
+
+        max_signature_len = 0
+        if in_synopsis:
+            for _s in i.signals:
+                for a in _s.args:
+                    max_signature_len = max(len(a.signature), max_signature_len)
+        else:
+            for a in s.args:
+                max_signature_len = max(len(a.signature), max_signature_len)
+
+        if in_synopsis:
+            self.out.write('<link linkend="gdbus-signal-%s.%s">%s</link>%*s ('
+                           %(utils.dots_to_hyphens(i.name), s.name, s.name, max_signal_len - len(s.name), ''))
+        else:
+            self.out.write('%s%*s ('
+                           %(s.name, max_signal_len - len(s.name), ''))
+        count = 0
+        for a in s.args:
+            if (count > 0):
+                self.out.write(',\n%*s'%(max_signal_len + 2, ''))
+            self.out.write('%s%*s %s'%(a.signature, max_signature_len - len(a.signature), '', a.name))
+            count = count + 1
+        self.out.write(');\n')
+
+    def print_property_prototype(self, i, p, in_synopsis):
+        max_property_len = 0
+        if in_synopsis:
+            for _p in i.properties:
+                max_property_len = max(len(_p.name), max_property_len)
+        else:
+            max_property_len = max(len(p.name), max_property_len)
+
+        max_signature_len = 0
+        if in_synopsis:
+            for _p in i.properties:
+                max_signature_len = max(len(_p.signature), max_signature_len)
+        else:
+            max_signature_len = max(len(p.signature), max_signature_len)
+
+        if in_synopsis:
+            self.out.write('<link linkend="gdbus-property-%s.%s">%s</link>%*s'
+                           %(utils.dots_to_hyphens(i.name), p.name, p.name, max_property_len - len(p.name), ''))
+        else:
+            self.out.write('%s%*s'
+                           %(p.name, max_property_len - len(p.name), ''))
+        if p.readable and p.writable:
+            access = 'readwrite'
+        elif p.readable:
+            access = 'readable '
+        else:
+            access = 'writable '
+        self.out.write('  %s  %s\n'%(access, p.signature))
+
+
+    def print_synopsis_methods(self, i):
+        self.out.write('  <refsynopsisdiv role="synopsis">\n'%())
+        self.out.write('    <title role="synopsis.title">Methods</title>\n'%())
+        self.out.write('    <synopsis>\n'%())
+        for m in i.methods:
+            self.print_method_prototype(i, m, in_synopsis=True)
+        self.out.write('</synopsis>\n'%())
+        self.out.write('  </refsynopsisdiv>\n'%())
+
+    def print_synopsis_signals(self, i):
+        self.out.write('  <refsect1 role="signal_proto">\n'%())
+        self.out.write('    <title role="signal_proto.title">Signals</title>\n'%())
+        self.out.write('    <synopsis>\n'%())
+        for s in i.signals:
+            self.print_signal_prototype(i, s, in_synopsis=True)
+        self.out.write('</synopsis>\n'%())
+        self.out.write('  </refsect1>\n'%())
+
+    def print_synopsis_properties(self, i):
+        self.out.write('  <refsect1 role="properties">\n'%())
+        self.out.write('    <title role="properties.title">Properties</title>\n'%())
+        self.out.write('    <synopsis>\n'%())
+        for p in i.properties:
+            self.print_property_prototype(i, p, in_synopsis=True)
+        self.out.write('</synopsis>\n'%())
+        self.out.write('  </refsect1>\n'%())
+
+    def print_method(self, i, m):
+        self.out.write('<refsect2 role="method" id="gdbus-method-%s.%s">\n'%(utils.dots_to_hyphens(i.name), m.name))
+        self.out.write('  <title>The %s() method</title>\n'%(m.name))
+        self.out.write('  <indexterm zone="gdbus-method-%s.%s"><primary sortas="%s.%s">%s.%s()</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), m.name, i.name_without_prefix, m.name, i.name, m.name))
+        self.out.write('<programlisting>\n')
+        self.print_method_prototype(i, m, in_synopsis=False)
+        self.out.write('</programlisting>\n')
+        self.out.write('<para>%s</para>\n'%(self.expand(m.doc_string, True)))
+        self.out.write('<variablelist role="params">\n')
+        for a in m.in_args:
+            self.out.write('<varlistentry>\n'%())
+            self.out.write('  <term><literal>IN %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
+            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
+            self.out.write('</varlistentry>\n'%())
+        for a in m.out_args:
+            self.out.write('<varlistentry>\n'%())
+            self.out.write('  <term><literal>OUT %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
+            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
+            self.out.write('</varlistentry>\n'%())
+        self.out.write('</variablelist>\n')
+        if len(m.since) > 0:
+            self.out.write('<para role="since">Since %s</para>\n'%(m.since))
+        if m.deprecated:
+            self.out.write('<warning><para>The %s() method is deprecated.</para></warning>'%(m.name))
+        self.out.write('</refsect2>\n')
+
+    def print_signal(self, i, s):
+        self.out.write('<refsect2 role="signal" id="gdbus-signal-%s.%s">\n'%(utils.dots_to_hyphens(i.name), s.name))
+        self.out.write('  <title>The "%s" signal</title>\n'%(s.name))
+        self.out.write('  <indexterm zone="gdbus-signal-%s.%s"><primary sortas="%s::%s">%s::%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), s.name, i.name_without_prefix, s.name, i.name, s.name))
+        self.out.write('<programlisting>\n')
+        self.print_signal_prototype(i, s, in_synopsis=False)
+        self.out.write('</programlisting>\n')
+        self.out.write('<para>%s</para>\n'%(self.expand(s.doc_string, True)))
+        self.out.write('<variablelist role="params">\n')
+        for a in s.args:
+            self.out.write('<varlistentry>\n'%())
+            self.out.write('  <term><literal>%s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
+            self.out.write('  <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
+            self.out.write('</varlistentry>\n'%())
+        self.out.write('</variablelist>\n')
+        if len(s.since) > 0:
+            self.out.write('<para role="since">Since %s</para>\n'%(s.since))
+        if s.deprecated:
+            self.out.write('<warning><para>The "%s" signal is deprecated.</para></warning>'%(s.name))
+        self.out.write('</refsect2>\n')
+
+    def print_property(self, i, p):
+        self.out.write('<refsect2 role="property" id="gdbus-property-%s.%s">\n'%(utils.dots_to_hyphens(i.name), p.name))
+        self.out.write('  <title>The "%s" property</title>\n'%(p.name))
+        self.out.write('  <indexterm zone="gdbus-property-%s.%s"><primary sortas="%s:%s">%s:%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), p.name, i.name_without_prefix, p.name, i.name, p.name))
+        self.out.write('<programlisting>\n')
+        self.print_property_prototype(i, p, in_synopsis=False)
+        self.out.write('</programlisting>\n')
+        self.out.write('<para>%s</para>\n'%(self.expand(p.doc_string, True)))
+        if len(p.since) > 0:
+            self.out.write('<para role="since">Since %s</para>\n'%(p.since))
+        if p.deprecated:
+            self.out.write('<warning><para>The "%s" property is deprecated.</para></warning>'%(p.name))
+        self.out.write('</refsect2>\n')
+
+    def expand(self, s, expandParamsAndConstants):
+        for key in self.expand_member_dict_keys:
+            s = s.replace(key, self.expand_member_dict[key])
+        for key in self.expand_iface_dict_keys:
+            s = s.replace(key, self.expand_iface_dict[key])
+        if expandParamsAndConstants:
+            # replace @foo with <parameter>foo</parameter>
+            s = re.sub('@[a-zA-Z0-9_]*', lambda m: '<parameter>' + m.group(0)[1:] + '</parameter>', s)
+            # replace e.g. %TRUE with <constant>TRUE</constant>
+            s = re.sub('%[a-zA-Z0-9_]*', lambda m: '<constant>' + m.group(0)[1:] + '</constant>', s)
+        return s
+
+    def generate_expand_dicts(self):
+        self.expand_member_dict = {}
+        self.expand_iface_dict = {}
+        for i in self.ifaces:
+            key = '#%s'%(i.name)
+            value = '<link linkend="gdbus-interface-%s.top_of_page">%s</link>'%(utils.dots_to_hyphens(i.name), i.name)
+            self.expand_iface_dict[key] = value
+            for m in i.methods:
+                key = '%s.%s()'%(i.name, m.name)
+                value = '<link linkend="gdbus-method-%s.%s">%s()</link>'%(utils.dots_to_hyphens(i.name), m.name, m.name)
+                self.expand_member_dict[key] = value
+            for s in i.signals:
+                key = '#%s::%s'%(i.name, s.name)
+                value = '<link linkend="gdbus-signal-%s.%s">"%s"</link>'%(utils.dots_to_hyphens(i.name), s.name, s.name)
+                self.expand_member_dict[key] = value
+            for p in i.properties:
+                key = '#%s:%s'%(i.name, p.name)
+                value = '<link linkend="gdbus-property-%s.%s">"%s"</link>'%(utils.dots_to_hyphens(i.name), p.name, p.name)
+                self.expand_member_dict[key] = value
+        # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
+        # is evaluated before #org.foo.Iface:Media ...
+        self.expand_member_dict_keys = self.expand_member_dict.keys()
+        self.expand_member_dict_keys.sort(reverse=True)
+        self.expand_iface_dict_keys = self.expand_iface_dict.keys()
+        self.expand_iface_dict_keys.sort(reverse=True)
+
+    def generate(self):
+        for i in self.ifaces:
+            self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
+            self.out.write(''%())
+            self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
+            self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
+            self.out.write('               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [\n'%())
+            self.out.write(']>\n'%())
+            self.out.write('<refentry id="gdbus-%s">\n'%(i.name))
+            self.out.write('  <refmeta>'%())
+            self.out.write('    <refentrytitle role="top_of_page" id="gdbus-interface-%s.top_of_page">%s</refentrytitle>\n'%(utils.dots_to_hyphens(i.name), i.name))
+            self.out.write('  <indexterm zone="gdbus-interface-%s.top_of_page"><primary sortas="%s">%s</primary></indexterm>\n'%(utils.dots_to_hyphens(i.name), i.name_without_prefix, i.name))
+            self.out.write('  </refmeta>'%())
+
+            self.out.write('  <refnamediv>'%())
+            self.out.write('    <refname>%s</refname>'%(i.name))
+            self.out.write('    <refpurpose>%s</refpurpose>'%(i.doc_string_brief))
+            self.out.write('  </refnamediv>'%())
+
+            if len(i.methods) > 0:
+                self.print_synopsis_methods(i)
+            if len(i.signals) > 0:
+                self.print_synopsis_signals(i)
+            if len(i.properties) > 0:
+                self.print_synopsis_properties(i)
+
+            self.out.write('<refsect1 role="desc" id="gdbus-interface-%s">\n'%(utils.dots_to_hyphens(i.name)))
+            self.out.write('  <title role="desc.title">Description</title>\n'%())
+            self.out.write('  <para>%s</para>\n'%(self.expand(i.doc_string, True)))
+            if len(i.since) > 0:
+                self.out.write('  <para role="since">Since %s</para>\n'%(i.since))
+            if i.deprecated:
+                self.out.write('<warning><para>The %s interface is deprecated.</para></warning>'%(i.name))
+            self.out.write('</refsect1>\n'%())
+
+            if len(i.methods) > 0:
+                self.out.write('<refsect1 role="details" id="gdbus-methods-%s">\n'%(i.name))
+                self.out.write('  <title role="details.title">Method Details</title>\n'%())
+                for m in i.methods:
+                    self.print_method(i, m)
+                self.out.write('</refsect1>\n'%())
+
+            if len(i.signals) > 0:
+                self.out.write('<refsect1 role="details" id="gdbus-signals-%s">\n'%(i.name))
+                self.out.write('  <title role="details.title">Signal Details</title>\n'%())
+                for s in i.signals:
+                    self.print_signal(i, s)
+                self.out.write('</refsect1>\n'%())
+
+            if len(i.properties) > 0:
+                self.out.write('<refsect1 role="details" id="gdbus-properties-%s">\n'%(i.name))
+                self.out.write('  <title role="details.title">Property Details</title>\n'%())
+                for s in i.properties:
+                    self.print_property(i, s)
+                self.out.write('</refsect1>\n'%())
+
+            self.out.write('</refentry>\n')
+            self.out.write('\n')
+
diff --git a/gio/gdbus/codegen/codegen_main.py b/gio/gdbus/codegen/codegen_main.py
new file mode 100755
index 0000000..f11ef1d
--- /dev/null
+++ b/gio/gdbus/codegen/codegen_main.py
@@ -0,0 +1,200 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+import sys
+import optparse
+
+import config
+from . import utils
+from . import dbustypes
+from . import parser
+from . import codegen
+from . import codegen_docbook
+
+def find_arg(arg_list, arg_name):
+    for a in arg_list:
+        if a.name == arg_name:
+            return a
+    return None
+
+def find_method(iface, method):
+    for m in iface.methods:
+        if m.name == method:
+            return m
+    return None
+
+def find_signal(iface, signal):
+    for m in iface.signals:
+        if m.name == signal:
+            return m
+    return None
+
+def find_prop(iface, prop):
+    for m in iface.properties:
+        if m.name == prop:
+            return m
+    return None
+
+def apply_annotation(iface_list, iface, method, signal, prop, arg, key, value):
+    for i in iface_list:
+        if i.name == iface:
+            iface_obj = i
+            break
+
+    if iface_obj == None:
+        raise RuntimeError('No interface %s'%iface)
+
+    target_obj = None
+
+    if method:
+        method_obj = find_method(iface_obj, method)
+        if method_obj == None:
+            raise RuntimeError('No method %s on interface %s'%(method, iface))
+        if arg:
+            arg_obj = find_arg(method_obj.in_args, arg)
+            if (arg_obj == None):
+                arg_obj = find_arg(method_obj.out_args, arg)
+                if (arg_obj == None):
+                    raise RuntimeError('No arg %s on method %s on interface %s'%(arg, method, iface))
+            target_obj = arg_obj
+        else:
+            target_obj = method_obj
+    elif signal:
+        signal_obj = find_signal(iface_obj, signal)
+        if signal_obj == None:
+            raise RuntimeError('No signal %s on interface %s'%(signal, iface))
+        if arg:
+            arg_obj = find_arg(signal_obj.args, arg)
+            if (arg_obj == None):
+                raise RuntimeError('No arg %s on signal %s on interface %s'%(arg, signal, iface))
+            target_obj = arg_obj
+        else:
+            target_obj = signal_obj
+    elif prop:
+        prop_obj = find_prop(iface_obj, prop)
+        if prop_obj == None:
+            raise RuntimeError('No property %s on interface %s'%(prop, iface))
+        target_obj = prop_obj
+    else:
+        target_obj = iface_obj
+    target_obj.annotations.insert(0, dbustypes.Annotation(key, value))
+
+
+def apply_annotations(iface_list, annotation_list):
+    # apply annotations given on the command line
+    for (what, key, value) in annotation_list:
+        pos = what.find('::')
+        if pos != -1:
+            # signal
+            iface = what[0:pos];
+            signal = what[pos + 2:]
+            pos = signal.find('[')
+            if pos != -1:
+                arg = signal[pos + 1:]
+                signal = signal[0:pos]
+                pos = arg.find(']')
+                arg = arg[0:pos]
+                apply_annotation(iface_list, iface, None, signal, None, arg, key, value)
+            else:
+                apply_annotation(iface_list, iface, None, signal, None, None, key, value)
+        else:
+            pos = what.find(':')
+            if pos != -1:
+                # property
+                iface = what[0:pos];
+                prop = what[pos + 1:]
+                apply_annotation(iface_list, iface, None, None, prop, None, key, value)
+            else:
+                pos = what.find('()')
+                if pos != -1:
+                    # method
+                    combined = what[0:pos]
+                    pos = combined.rfind('.')
+                    iface = combined[0:pos]
+                    method = combined[pos + 1:]
+                    pos = what.find('[')
+                    if pos != -1:
+                        arg = what[pos + 1:]
+                        pos = arg.find(']')
+                        arg = arg[0:pos]
+                        apply_annotation(iface_list, iface, method, None, None, arg, key, value)
+                    else:
+                        apply_annotation(iface_list, iface, method, None, None, None, key, value)
+                else:
+                    # must be an interface
+                    iface = what
+                    apply_annotation(iface_list, iface, None, None, None, None, key, value)
+
+def codegen_main():
+    arg_parser = optparse.OptionParser('%prog [options]')
+    arg_parser.add_option('', '--xml-files', metavar='FILE', action='append',
+                          help='D-Bus introspection XML file')
+    arg_parser.add_option('', '--interface-prefix', metavar='PREFIX', default='',
+                            help='String to strip from D-Bus interface names for code and docs')
+    arg_parser.add_option('', '--c-namespace', metavar='NAMESPACE', default='',
+                            help='The namespace to use for generated C code')
+    arg_parser.add_option('', '--c-generate-object-manager', action='store_true',
+                            help='Generate a GDBusObjectManagerClient subclass when generating C code')
+    arg_parser.add_option('', '--generate-c-code', metavar='OUTFILES',
+                          help='Generate C code in OUTFILES.[ch]')
+    arg_parser.add_option('', '--generate-docbook', metavar='OUTFILES',
+                          help='Generate Docbook in OUTFILES-org.Project.IFace.xml')
+    arg_parser.add_option('', '--annotate', nargs=3, action='append', metavar='WHAT KEY VALUE',
+                          help='Add annotation (may be used several times)')
+    (opts, args) = arg_parser.parse_args();
+
+    all_ifaces = []
+    for fname in args:
+        f = open(fname)
+        xml_data = f.read()
+        f.close()
+        parsed_ifaces = parser.parse_dbus_xml(xml_data)
+        all_ifaces.extend(parsed_ifaces)
+
+    if opts.annotate != None:
+        apply_annotations(all_ifaces, opts.annotate)
+
+    for i in parsed_ifaces:
+        i.post_process(opts.interface_prefix, opts.c_namespace)
+
+    docbook = opts.generate_docbook
+    docbook_gen = codegen_docbook.DocbookCodeGenerator(all_ifaces, docbook);
+    if docbook:
+        ret = docbook_gen.generate()
+
+    c_code = opts.generate_c_code
+    if c_code:
+        h = file(c_code + '.h', 'w')
+        c = file(c_code + '.c', 'w')
+        gen = codegen.CodeGenerator(all_ifaces,
+                                    opts.c_namespace,
+                                    opts.interface_prefix,
+                                    opts.c_generate_object_manager,
+                                    docbook_gen,
+                                    h, c);
+        ret = gen.generate()
+
+    sys.exit(0)
+
+if __name__ == "__main__":
+    codegen_main()
diff --git a/gio/gdbus/codegen/config.py.in b/gio/gdbus/codegen/config.py.in
new file mode 100644
index 0000000..ee1a308
--- /dev/null
+++ b/gio/gdbus/codegen/config.py.in
@@ -0,0 +1,27 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+DATADIR = "@datarootdir@"
+DATADIR = DATADIR.replace(
+    "${prefix}", "@prefix@")
+VERSION = "@VERSION@"
diff --git a/gio/gdbus/codegen/dbustypes.py b/gio/gdbus/codegen/dbustypes.py
new file mode 100644
index 0000000..a0fcdfc
--- /dev/null
+++ b/gio/gdbus/codegen/dbustypes.py
@@ -0,0 +1,364 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+from . import utils
+
+class Annotation:
+    def __init__(self, key, value):
+        self.key = key
+        self.value = value
+        self.annotations = []
+
+class Arg:
+    def __init__(self, name, signature):
+        self.name = name
+        self.signature = signature
+        self.annotations = []
+        self.doc_string = ''
+        self.since = ''
+
+    def post_process(self, interface_prefix, c_namespace, arg_number):
+        if len(self.doc_string) == 0:
+            self.doc_string = utils.lookup_docs(self.annotations)
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+
+        if self.name == None:
+            self.name = 'unnamed_arg%d'%arg_number
+        # default to GVariant
+        self.ctype_in_g  = 'GVariant *'
+        self.ctype_in  = 'GVariant *'
+        self.ctype_out = 'GVariant **'
+        self.gtype = 'G_TYPE_VARIANT'
+        self.free_func = 'g_variant_unref'
+        self.format_in = '@' + self.signature
+        self.format_out = '@' + self.signature
+        if not utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.ForceGVariant'):
+            if self.signature == 'b':
+                self.ctype_in_g  = 'gboolean '
+                self.ctype_in  = 'gboolean '
+                self.ctype_out = 'gboolean *'
+                self.gtype = 'G_TYPE_BOOLEAN'
+                self.free_func = None
+                self.format_in = 'b'
+                self.format_out = 'b'
+            elif self.signature == 'y':
+                self.ctype_in_g  = 'guchar '
+                self.ctype_in  = 'guchar '
+                self.ctype_out = 'guchar *'
+                self.gtype = 'G_TYPE_UCHAR'
+                self.free_func = None
+                self.format_in = 'y'
+                self.format_out = 'y'
+            elif self.signature == 'n':
+                self.ctype_in_g  = 'gint '
+                self.ctype_in  = 'gint16 '
+                self.ctype_out = 'gint16 *'
+                self.gtype = 'G_TYPE_INT'
+                self.free_func = None
+                self.format_in = 'n'
+                self.format_out = 'n'
+            elif self.signature == 'q':
+                self.ctype_in_g  = 'guint '
+                self.ctype_in  = 'guint16 '
+                self.ctype_out = 'guint16 *'
+                self.gtype = 'G_TYPE_UINT'
+                self.free_func = None
+                self.format_in = 'q'
+                self.format_out = 'q'
+            elif self.signature == 'i':
+                self.ctype_in_g  = 'gint '
+                self.ctype_in  = 'gint '
+                self.ctype_out = 'gint *'
+                self.gtype = 'G_TYPE_INT'
+                self.free_func = None
+                self.format_in = 'i'
+                self.format_out = 'i'
+            elif self.signature == 'u':
+                self.ctype_in_g  = 'guint '
+                self.ctype_in  = 'guint '
+                self.ctype_out = 'guint *'
+                self.gtype = 'G_TYPE_UINT'
+                self.free_func = None
+                self.format_in = 'u'
+                self.format_out = 'u'
+            elif self.signature == 'x':
+                self.ctype_in_g  = 'gint64 '
+                self.ctype_in  = 'gint64 '
+                self.ctype_out = 'gint64 *'
+                self.gtype = 'G_TYPE_INT64'
+                self.free_func = None
+                self.format_in = 'x'
+                self.format_out = 'x'
+            elif self.signature == 't':
+                self.ctype_in_g  = 'guint64 '
+                self.ctype_in  = 'guint64 '
+                self.ctype_out = 'guint64 *'
+                self.gtype = 'G_TYPE_UINT64'
+                self.free_func = None
+                self.format_in = 't'
+                self.format_out = 't'
+            elif self.signature == 'd':
+                self.ctype_in_g  = 'gdouble '
+                self.ctype_in  = 'gdouble '
+                self.ctype_out = 'gdouble *'
+                self.gtype = 'G_TYPE_DOUBLE'
+                self.free_func = None
+                self.format_in = 'd'
+                self.format_out = 'd'
+            elif self.signature == 's':
+                self.ctype_in_g  = 'const gchar *'
+                self.ctype_in  = 'const gchar *'
+                self.ctype_out = 'gchar **'
+                self.gtype = 'G_TYPE_STRING'
+                self.free_func = 'g_free'
+                self.format_in = 's'
+                self.format_out = 's'
+            elif self.signature == 'o':
+                self.ctype_in_g  = 'const gchar *'
+                self.ctype_in  = 'const gchar *'
+                self.ctype_out = 'gchar **'
+                self.gtype = 'G_TYPE_STRING'
+                self.free_func = 'g_free'
+                self.format_in = 'o'
+                self.format_out = 'o'
+            elif self.signature == 'g':
+                self.ctype_in_g  = 'const gchar *'
+                self.ctype_in  = 'const gchar *'
+                self.ctype_out = 'gchar **'
+                self.gtype = 'G_TYPE_STRING'
+                self.free_func = 'g_free'
+                self.format_in = 'g'
+                self.format_out = 'g'
+            elif self.signature == 'ay':
+                self.ctype_in_g  = 'const gchar *'
+                self.ctype_in  = 'const gchar *'
+                self.ctype_out = 'gchar **'
+                self.gtype = 'G_TYPE_STRING'
+                self.free_func = 'g_free'
+                self.format_in = '^ay'
+                self.format_out = '^ay'
+            elif self.signature == 'as':
+                self.ctype_in_g  = 'const gchar *const *'
+                self.ctype_in  = 'const gchar *const *'
+                self.ctype_out = 'gchar ***'
+                self.gtype = 'G_TYPE_STRV'
+                self.free_func = 'g_strfreev'
+                self.format_in = '^as'
+                self.format_out = '^as'
+            elif self.signature == 'aay':
+                self.ctype_in_g  = 'const gchar *const *'
+                self.ctype_in  = 'const gchar *const *'
+                self.ctype_out = 'gchar ***'
+                self.gtype = 'G_TYPE_STRV'
+                self.free_func = 'g_strfreev'
+                self.format_in = '^aay'
+                self.format_out = '^aay'
+
+class Method:
+    def __init__(self, name):
+        self.name = name
+        self.in_args = []
+        self.out_args = []
+        self.annotations = []
+        self.doc_string = ''
+        self.since = ''
+        self.deprecated = False
+
+    def post_process(self, interface_prefix, c_namespace):
+        if len(self.doc_string) == 0:
+            self.doc_string = utils.lookup_docs(self.annotations)
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+
+        name = self.name
+        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
+        if utils.is_ugly_case(overridden_name):
+            self.name_lower = overridden_name.lower()
+        else:
+            if overridden_name:
+                name = overridden_name
+            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
+        self.name_hyphen = self.name_lower.replace('_', '-')
+
+        arg_count = 0
+        for a in self.in_args:
+            a.post_process(interface_prefix, c_namespace, arg_count)
+            arg_count += 1
+
+        for a in self.out_args:
+            a.post_process(interface_prefix, c_namespace, arg_count)
+            arg_count += 1
+
+        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
+            self.deprecated = True
+
+class Signal:
+    def __init__(self, name):
+        self.name = name
+        self.args = []
+        self.annotations = []
+        self.doc_string = ''
+        self.since = ''
+        self.deprecated = False
+
+    def post_process(self, interface_prefix, c_namespace):
+        if len(self.doc_string) == 0:
+            self.doc_string = utils.lookup_docs(self.annotations)
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+
+        name = self.name
+        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
+        if utils.is_ugly_case(overridden_name):
+            self.name_lower = overridden_name.lower()
+        else:
+            if overridden_name:
+                name = overridden_name
+            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
+        self.name_hyphen = self.name_lower.replace('_', '-')
+
+        arg_count = 0
+        for a in self.args:
+            a.post_process(interface_prefix, c_namespace, arg_count)
+            arg_count += 1
+
+        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
+            self.deprecated = True
+
+class Property:
+    def __init__(self, name, signature, access):
+        self.name = name
+        self.signature = signature
+        self.access = access
+        self.annotations = []
+        self.arg = Arg('value', self.signature)
+        self.arg.annotations = self.annotations
+        self.readable = False
+        self.writable = False
+        if self.access == 'readwrite':
+            self.readable = True
+            self.writable = True
+        elif self.access == 'read':
+            self.readable = True
+        elif self.access == 'write':
+            self.writable = True
+        else:
+            raise RuntimeError('Invalid access type %s'%self.access)
+        self.doc_string = ''
+        self.since = ''
+        self.deprecated = False
+
+    def post_process(self, interface_prefix, c_namespace):
+        if len(self.doc_string) == 0:
+            self.doc_string = utils.lookup_docs(self.annotations)
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+
+        name = self.name
+        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
+        if utils.is_ugly_case(overridden_name):
+            self.name_lower = overridden_name.lower()
+        else:
+            if overridden_name:
+                name = overridden_name
+            self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
+        if self.name_lower == 'type':
+            self.name_lower = 'type_'
+        self.name_hyphen = self.name_lower.replace('_', '-')
+
+        # recalculate arg
+        self.arg.annotations = self.annotations
+        self.arg.post_process(interface_prefix, c_namespace, 0)
+
+        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
+            self.deprecated = True
+
+class Interface:
+    def __init__(self, name):
+        self.name = name
+        self.methods = []
+        self.signals = []
+        self.properties = []
+        self.annotations = []
+        self.doc_string = ''
+        self.doc_string_brief = ''
+        self.since = ''
+        self.deprecated = False
+
+    def post_process(self, interface_prefix, c_namespace):
+        if len(self.doc_string) == 0:
+            self.doc_string = utils.lookup_docs(self.annotations)
+        if len(self.doc_string_brief) == 0:
+            self.doc_string_brief = utils.lookup_brief_docs(self.annotations)
+        if len(self.since) == 0:
+            self.since = utils.lookup_since(self.annotations)
+
+        overridden_name = utils.lookup_annotation(self.annotations, 'org.gtk.GDBus.C.Name')
+        if utils.is_ugly_case(overridden_name):
+            name = overridden_name.replace('_', '')
+            name_with_ns = c_namespace + name
+            self.name_without_prefix = name
+            self.camel_name = name_with_ns
+            if len(c_namespace) > 0:
+                self.ns_upper = utils.camel_case_to_uscore(c_namespace).upper() + '_'
+                self.name_lower = utils.camel_case_to_uscore(c_namespace) + '_' + overridden_name.lower()
+            else:
+                self.ns_upper = ''
+                self.name_lower = overridden_name.lower()
+            self.name_upper = overridden_name.upper()
+
+            #raise RuntimeError('handle Ugly_Case ', overridden_name)
+        else:
+            if overridden_name:
+                name = overridden_name
+            else:
+                name = self.name
+                if name.startswith(interface_prefix):
+                    name = name[len(interface_prefix):]
+            self.name_without_prefix = name
+            name = utils.strip_dots(name)
+            name_with_ns = utils.strip_dots(c_namespace + '.' + name)
+
+            self.camel_name = name_with_ns
+            if len(c_namespace) > 0:
+                self.ns_upper = utils.camel_case_to_uscore(c_namespace).upper() + '_'
+                self.name_lower = utils.camel_case_to_uscore(c_namespace) + '_' + utils.camel_case_to_uscore(name)
+            else:
+                self.ns_upper = ''
+                self.name_lower = utils.camel_case_to_uscore(name_with_ns)
+            self.name_upper = utils.camel_case_to_uscore(name).upper()
+
+        self.name_hyphen = self.name_upper.lower().replace('_', '-')
+
+        if utils.lookup_annotation(self.annotations, 'org.freedesktop.DBus.Deprecated') == 'true':
+            self.deprecated = True
+
+        for m in self.methods:
+            m.post_process(interface_prefix, c_namespace)
+
+        for s in self.signals:
+            s.post_process(interface_prefix, c_namespace)
+
+        for p in self.properties:
+            p.post_process(interface_prefix, c_namespace)
diff --git a/gio/gdbus/codegen/gdbus-codegen.in b/gio/gdbus/codegen/gdbus-codegen.in
new file mode 100755
index 0000000..78c3290
--- /dev/null
+++ b/gio/gdbus/codegen/gdbus-codegen.in
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+
+import os
+import sys
+
+if os.name == 'nt':
+    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
+    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus')
+else:
+    path = os.path.join('@libdir@', 'gdbus')
+
+sys.path.insert(0, path)
+from codegen import codegen_main
+
+sys.exit(codegen_main.codegen_main())
diff --git a/gio/gdbus/codegen/parser.py b/gio/gdbus/codegen/parser.py
new file mode 100644
index 0000000..5fabd44
--- /dev/null
+++ b/gio/gdbus/codegen/parser.py
@@ -0,0 +1,290 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+import sys
+import xml.parsers.expat
+
+from . import dbustypes
+
+class DBusXMLParser:
+    STATE_TOP = 'top'
+    STATE_NODE = 'node'
+    STATE_INTERFACE = 'interface'
+    STATE_METHOD = 'method'
+    STATE_SIGNAL = 'signal'
+    STATE_PROPERTY = 'property'
+    STATE_ARG = 'arg'
+    STATE_ANNOTATION = 'annotation'
+    STATE_IGNORED = 'ignored'
+
+    def __init__(self, xml_data):
+        self._parser = xml.parsers.expat.ParserCreate()
+        self._parser.CommentHandler = self.handle_comment
+        self._parser.CharacterDataHandler = self.handle_char_data
+        self._parser.StartElementHandler = self.handle_start_element
+        self._parser.EndElementHandler = self.handle_end_element
+
+        self.parsed_interfaces = []
+        self._cur_object = None
+
+        self.state = DBusXMLParser.STATE_TOP
+        self.state_stack = []
+        self._cur_object = None
+        self._cur_object_stack = []
+
+        self.doc_comment_last_symbol = ''
+
+        self._parser.Parse(xml_data)
+
+    COMMENT_STATE_BEGIN = 'begin'
+    COMMENT_STATE_PARAMS = 'params'
+    COMMENT_STATE_BODY = 'body'
+    COMMENT_STATE_SKIP = 'skip'
+    def handle_comment(self, data):
+        comment_state = DBusXMLParser.COMMENT_STATE_BEGIN;
+        lines = data.split('\n')
+        symbol = ''
+        body = ''
+        in_para = False
+        params = {}
+        for line in lines:
+            orig_line = line
+            line = line.lstrip()
+            if comment_state == DBusXMLParser.COMMENT_STATE_BEGIN:
+                if len(line) > 0:
+                    colon_index = line.find(': ')
+                    if colon_index == -1:
+                        if line.endswith(':'):
+                            symbol = line[0:len(line)-1]
+                            comment_state = DBusXMLParser.COMMENT_STATE_PARAMS
+                        else:
+                            comment_state = DBusXMLParser.COMMENT_STATE_SKIP
+                    else:
+                        symbol = line[0:colon_index]
+                        rest_of_line = line[colon_index+2:].strip()
+                        if len(rest_of_line) > 0:
+                            body += '<para>' + rest_of_line + '</para>'
+                        comment_state = DBusXMLParser.COMMENT_STATE_PARAMS
+            elif comment_state == DBusXMLParser.COMMENT_STATE_PARAMS:
+                if line.startswith('@'):
+                    colon_index = line.find(': ')
+                    if colon_index == -1:
+                        comment_state = DBusXMLParser.COMMENT_STATE_BODY
+                        if not in_para:
+                            body += '<para>'
+                            in_para = True
+                        body += orig_line + '\n'
+                    else:
+                        param = line[1:colon_index]
+                        docs = line[colon_index + 2:]
+                        params[param] = docs
+                else:
+                    comment_state = DBusXMLParser.COMMENT_STATE_BODY
+                    if len(line) > 0:
+                        if not in_para:
+                            body += '<para>'
+                            in_para = True
+                        body += orig_line + '\n'
+            elif comment_state == DBusXMLParser.COMMENT_STATE_BODY:
+                if len(line) > 0:
+                    if not in_para:
+                        body += '<para>'
+                        in_para = True
+                    body += orig_line + '\n'
+                else:
+                    if in_para:
+                        body += '</para>'
+                        in_para = False
+        if in_para:
+            body += '</para>'
+
+        if symbol != '':
+            self.doc_comment_last_symbol = symbol
+            self.doc_comment_params = params
+            self.doc_comment_body = body
+
+    def handle_char_data(self, data):
+        #print 'char_data=%s'%data
+        pass
+
+    def handle_start_element(self, name, attrs):
+        old_state = self.state
+        old_cur_object = self._cur_object
+        if self.state == DBusXMLParser.STATE_IGNORED:
+            self.state = DBusXMLParser.STATE_IGNORED
+        elif self.state == DBusXMLParser.STATE_TOP:
+            if name == DBusXMLParser.STATE_NODE:
+                self.state = DBusXMLParser.STATE_NODE
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+        elif self.state == DBusXMLParser.STATE_NODE:
+            if name == DBusXMLParser.STATE_INTERFACE:
+                self.state = DBusXMLParser.STATE_INTERFACE
+                iface = dbustypes.Interface(attrs['name'])
+                self._cur_object = iface
+                self.parsed_interfaces.append(iface)
+            elif name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+            # assign docs, if any
+            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
+                self._cur_object.doc_string = self.doc_comment_body
+                if self.doc_comment_params.has_key('short_description'):
+                    short_description = self.doc_comment_params['short_description']
+                    self._cur_object.doc_string_brief = short_description
+                if self.doc_comment_params.has_key('since'):
+                    self._cur_object.since = self.doc_comment_params['since']
+
+        elif self.state == DBusXMLParser.STATE_INTERFACE:
+            if name == DBusXMLParser.STATE_METHOD:
+                self.state = DBusXMLParser.STATE_METHOD
+                method = dbustypes.Method(attrs['name'])
+                self._cur_object.methods.append(method)
+                self._cur_object = method
+            elif name == DBusXMLParser.STATE_SIGNAL:
+                self.state = DBusXMLParser.STATE_SIGNAL
+                signal = dbustypes.Signal(attrs['name'])
+                self._cur_object.signals.append(signal)
+                self._cur_object = signal
+            elif name == DBusXMLParser.STATE_PROPERTY:
+                self.state = DBusXMLParser.STATE_PROPERTY
+                prop = dbustypes.Property(attrs['name'], attrs['type'], attrs['access'])
+                self._cur_object.properties.append(prop)
+                self._cur_object = prop
+            elif name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+            # assign docs, if any
+            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
+                self._cur_object.doc_string = self.doc_comment_body
+                if self.doc_comment_params.has_key('since'):
+                    self._cur_object.since = self.doc_comment_params['since']
+
+        elif self.state == DBusXMLParser.STATE_METHOD:
+            if name == DBusXMLParser.STATE_ARG:
+                self.state = DBusXMLParser.STATE_ARG
+                arg_name = None
+                if attrs.has_key('name'):
+                    arg_name = attrs['name']
+                arg = dbustypes.Arg(arg_name, attrs['type'])
+                direction = attrs['direction']
+                if direction == 'in':
+                    self._cur_object.in_args.append(arg)
+                elif direction == 'out':
+                    self._cur_object.out_args.append(arg)
+                else:
+                    raise RuntimeError('Invalid direction "%s"'%(direction))
+                self._cur_object = arg
+            elif name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+            # assign docs, if any
+            if self.doc_comment_last_symbol == old_cur_object.name:
+                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
+                    doc_string = self.doc_comment_params[attrs['name']]
+                    if doc_string != None:
+                        self._cur_object.doc_string = doc_string
+                    if self.doc_comment_params.has_key('since'):
+                        self._cur_object.since = self.doc_comment_params['since']
+
+        elif self.state == DBusXMLParser.STATE_SIGNAL:
+            if name == DBusXMLParser.STATE_ARG:
+                self.state = DBusXMLParser.STATE_ARG
+                arg_name = None
+                if attrs.has_key('name'):
+                    arg_name = attrs['name']
+                arg = dbustypes.Arg(arg_name, attrs['type'])
+                self._cur_object.args.append(arg)
+                self._cur_object = arg
+            elif name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+            # assign docs, if any
+            if self.doc_comment_last_symbol == old_cur_object.name:
+                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
+                    doc_string = self.doc_comment_params[attrs['name']]
+                    if doc_string != None:
+                        self._cur_object.doc_string = doc_string
+                    if self.doc_comment_params.has_key('since'):
+                        self._cur_object.since = self.doc_comment_params['since']
+
+        elif self.state == DBusXMLParser.STATE_PROPERTY:
+            if name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+        elif self.state == DBusXMLParser.STATE_ARG:
+            if name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+        elif self.state == DBusXMLParser.STATE_ANNOTATION:
+            if name == DBusXMLParser.STATE_ANNOTATION:
+                self.state = DBusXMLParser.STATE_ANNOTATION
+                anno = dbustypes.Annotation(attrs['name'], attrs['value'])
+                self._cur_object.annotations.append(anno)
+                self._cur_object = anno
+            else:
+                self.state = DBusXMLParser.STATE_IGNORED
+
+        else:
+            raise RuntimeError('Unhandled state "%s" while entering element with name "%s"'%(self.state, name))
+
+        self.state_stack.append(old_state)
+        self._cur_object_stack.append(old_cur_object)
+
+    def handle_end_element(self, name):
+        self.state = self.state_stack.pop()
+        self._cur_object = self._cur_object_stack.pop()
+
+def parse_dbus_xml(xml_data):
+    parser = DBusXMLParser(xml_data)
+    return parser.parsed_interfaces
diff --git a/gio/gdbus/codegen/utils.py b/gio/gdbus/codegen/utils.py
new file mode 100644
index 0000000..687b979
--- /dev/null
+++ b/gio/gdbus/codegen/utils.py
@@ -0,0 +1,104 @@
+# -*- Mode: Python -*-
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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.
+#
+# Author: David Zeuthen <davidz@redhat.com>
+
+import distutils.version
+
+def strip_dots(s):
+    ret = ''
+    force_upper = False
+    for c in s:
+        if c == '.':
+            force_upper = True
+        else:
+            if force_upper:
+                ret += c.upper()
+                force_upper = False
+            else:
+                ret += c
+    return ret
+
+def dots_to_hyphens(s):
+    return s.replace('.', '-')
+
+def camel_case_to_uscore(s):
+    ret = ''
+    insert_uscore = False
+    prev_was_lower = False
+    for c in s:
+        if c.isupper():
+            if prev_was_lower:
+                insert_uscore = True
+            prev_was_lower = False
+        else:
+            prev_was_lower = True
+        if insert_uscore:
+            ret += '_'
+        ret += c.lower()
+        insert_uscore = False
+    return ret
+
+def is_ugly_case(s):
+    if s and s.find('_') > 0:
+        return True
+    return False
+
+def lookup_annotation(annotations, key):
+    if annotations:
+        for a in annotations:
+            if a.key == key:
+                return a.value
+    return None
+
+def lookup_docs(annotations):
+    s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString')
+    if s == None:
+        return ''
+    else:
+        return s
+
+def lookup_since(annotations):
+    s = lookup_annotation(annotations, 'org.gtk.GDBus.Since')
+    if s == None:
+        return ''
+    else:
+        return s
+
+def lookup_brief_docs(annotations):
+    s = lookup_annotation(annotations, 'org.gtk.GDBus.DocString.Short')
+    if s == None:
+        return ''
+    else:
+        return s
+
+# I'm sure this could be a lot more elegant if I was
+# more fluent in python...
+def my_version_cmp(a, b):
+    if len(a[0]) > 0 and len(b[0]) > 0:
+        va = distutils.version.LooseVersion(a[0])
+        vb = distutils.version.LooseVersion(b[0])
+        ret = va.__cmp__(vb)
+    else:
+        ret = cmp(a[0], b[0])
+    if ret != 0:
+        return ret
+    return cmp(a[1], b[1])
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 9929254..d21e42f 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -245,7 +245,7 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h
 gdbus_bz627724_LDADD = $(progs_ldadd)
 
 gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
-	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
+	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus:$(top_builddir)/gio/gdbus $(PYTHON) $(top_builddir)/gio/gdbus/codegen/gdbus-codegen	 \
 		--interface-prefix org.project.								\
 		--generate-c-code gdbus-test-codegen-generated						\
 		--c-generate-object-manager								\
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
index 3ca56c6..a1db4ab 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -22,7 +22,7 @@ GDBUS_GENERATED = 										\
 	$(NULL)
 
 $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
-	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
+	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus:$(top_builddir)/gio/gdbus $(PYTHON) $(top_builddir)/gio/gdbus/codegen/gdbus-codegen	 \
 		--interface-prefix org.gtk.GDBus.Example.ObjectManager.		\
 		--c-namespace Example 						\
 		--c-generate-object-manager					\
