(1) regenerate leaner genfiles, we're not using the object manager functionality (2) modify gen-gdbus-interfaces to exclude object manager functionality (3) make localed skeleton (4) namespace hostnamed's and localed's bus/name functions properly (5) edit main.c to init localed

3 files changed, 6 insertions, 712 deletions

diff --git a/src/interfaces/hostnamed/hostnamed-gen.c b/src/interfaces/hostnamed/hostnamed-gen.c
index 030277f..23f04b3 100644
--- a/src/interfaces/hostnamed/hostnamed-gen.c
+++ b/src/interfaces/hostnamed/hostnamed-gen.c
@@ -3172,567 +3172,3 @@ hostnamed_hostname1_skeleton_new (void)
   return HOSTNAMED_HOSTNAME1 (g_object_new (HOSTNAMED_TYPE_HOSTNAME1_SKELETON, NULL));
 }
 
-/* ------------------------------------------------------------------------
- * Code for Object, ObjectProxy and ObjectSkeleton
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:hostnamedObject
- * @title: hostnamedObject
- * @short_description: Specialized GDBusObject types
- *
- * This section contains the #hostnamedObject, #hostnamedObjectProxy, and #hostnamedObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.
- */
-
-/**
- * hostnamedObject:
- *
- * The #hostnamedObject type is a specialized container of interfaces.
- */
-
-/**
- * hostnamedObjectIface:
- * @parent_iface: The parent interface.
- *
- * Virtual table for the #hostnamedObject interface.
- */
-
-typedef hostnamedObjectIface hostnamedObjectInterface;
-G_DEFINE_INTERFACE_WITH_CODE (hostnamedObject, hostnamed_object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
-
-static void
-hostnamed_object_default_init (hostnamedObjectIface *iface)
-{
-  /**
-   * hostnamedObject:hostname1:
-   *
-   * The #hostnamedHostname1 instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-hostname1.top_of_page">org.freedesktop.hostname1</link>, if any.
-   *
-   * Connect to the #GObject::notify signal to get informed of property changes.
-   */
-  g_object_interface_install_property (iface, g_param_spec_object ("hostname1", "hostname1", "hostname1", HOSTNAMED_TYPE_HOSTNAME1, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
-
-}
-
-/**
- * hostnamed_object_get_hostname1:
- * @object: A #hostnamedObject.
- *
- * Gets the #hostnamedHostname1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-hostname1.top_of_page">org.freedesktop.hostname1</link> on @object, if any.
- *
- * Returns: (transfer full): A #hostnamedHostname1 that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
- */
-hostnamedHostname1 *hostnamed_object_get_hostname1 (hostnamedObject *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.hostname1");
-  if (ret == NULL)
-    return NULL;
-  return HOSTNAMED_HOSTNAME1 (ret);
-}
-
-
-/**
- * hostnamed_object_peek_hostname1: (skip)
- * @object: A #hostnamedObject.
- *
- * Like hostnamed_object_get_hostname1() but doesn't increase the reference count on the returned object.
- *
- * <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>
- *
- * Returns: (transfer none): A #hostnamedHostname1 or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
- */
-hostnamedHostname1 *hostnamed_object_peek_hostname1 (hostnamedObject *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.hostname1");
-  if (ret == NULL)
-    return NULL;
-  g_object_unref (ret);
-  return HOSTNAMED_HOSTNAME1 (ret);
-}
-
-
-static void
-hostnamed_object_notify (GDBusObject *object, GDBusInterface *interface)
-{
-  _ExtendedGDBusInterfaceInfo *info = (_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface);
-  /* info can be NULL if the other end is using a D-Bus interface we don't know
-   * anything about, for example old generated code in this process talking to
-   * newer generated code in the other process. */
-  if (info != NULL)
-    g_object_notify (G_OBJECT (object), info->hyphen_name);
-}
-
-/**
- * hostnamedObjectProxy:
- *
- * The #hostnamedObjectProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * hostnamedObjectProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #hostnamedObjectProxy.
- */
-
-static void
-hostnamed_object_proxy__hostnamed_object_iface_init (hostnamedObjectIface *iface G_GNUC_UNUSED)
-{
-}
-
-static void
-hostnamed_object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
-{
-  iface->interface_added = hostnamed_object_notify;
-  iface->interface_removed = hostnamed_object_notify;
-}
-
-
-G_DEFINE_TYPE_WITH_CODE (hostnamedObjectProxy, hostnamed_object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
-                         G_IMPLEMENT_INTERFACE (HOSTNAMED_TYPE_OBJECT, hostnamed_object_proxy__hostnamed_object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, hostnamed_object_proxy__g_dbus_object_iface_init));
-
-static void
-hostnamed_object_proxy_init (hostnamedObjectProxy *object G_GNUC_UNUSED)
-{
-}
-
-static void
-hostnamed_object_proxy_set_property (GObject      *gobject,
-  guint         prop_id,
-  const GValue *value G_GNUC_UNUSED,
-  GParamSpec   *pspec)
-{
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-}
-
-static void
-hostnamed_object_proxy_get_property (GObject      *gobject,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec)
-{
-  hostnamedObjectProxy *object = HOSTNAMED_OBJECT_PROXY (gobject);
-  GDBusInterface *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.hostname1");
-      g_value_take_object (value, interface);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-hostnamed_object_proxy_class_init (hostnamedObjectProxyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = hostnamed_object_proxy_set_property;
-  gobject_class->get_property = hostnamed_object_proxy_get_property;
-
-  g_object_class_override_property (gobject_class, 1, "hostname1");
-}
-
-/**
- * hostnamed_object_proxy_new:
- * @connection: A #GDBusConnection.
- * @object_path: An object path.
- *
- * Creates a new proxy object.
- *
- * Returns: (transfer full): The proxy object.
- */
-hostnamedObjectProxy *
-hostnamed_object_proxy_new (GDBusConnection *connection,
-  const gchar *object_path)
-{
-  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
-  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
-  return HOSTNAMED_OBJECT_PROXY (g_object_new (HOSTNAMED_TYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));
-}
-
-/**
- * hostnamedObjectSkeleton:
- *
- * The #hostnamedObjectSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * hostnamedObjectSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #hostnamedObjectSkeleton.
- */
-
-static void
-hostnamed_object_skeleton__hostnamed_object_iface_init (hostnamedObjectIface *iface G_GNUC_UNUSED)
-{
-}
-
-
-static void
-hostnamed_object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
-{
-  iface->interface_added = hostnamed_object_notify;
-  iface->interface_removed = hostnamed_object_notify;
-}
-
-G_DEFINE_TYPE_WITH_CODE (hostnamedObjectSkeleton, hostnamed_object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
-                         G_IMPLEMENT_INTERFACE (HOSTNAMED_TYPE_OBJECT, hostnamed_object_skeleton__hostnamed_object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, hostnamed_object_skeleton__g_dbus_object_iface_init));
-
-static void
-hostnamed_object_skeleton_init (hostnamedObjectSkeleton *object G_GNUC_UNUSED)
-{
-}
-
-static void
-hostnamed_object_skeleton_set_property (GObject      *gobject,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec)
-{
-  hostnamedObjectSkeleton *object = HOSTNAMED_OBJECT_SKELETON (gobject);
-  GDBusInterfaceSkeleton *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_value_get_object (value);
-      if (interface != NULL)
-        {
-          g_warn_if_fail (HOSTNAMED_IS_HOSTNAME1 (interface));
-          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
-        }
-      else
-        {
-          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.freedesktop.hostname1");
-        }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-hostnamed_object_skeleton_get_property (GObject      *gobject,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec)
-{
-  hostnamedObjectSkeleton *object = HOSTNAMED_OBJECT_SKELETON (gobject);
-  GDBusInterface *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.freedesktop.hostname1");
-      g_value_take_object (value, interface);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-hostnamed_object_skeleton_class_init (hostnamedObjectSkeletonClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = hostnamed_object_skeleton_set_property;
-  gobject_class->get_property = hostnamed_object_skeleton_get_property;
-
-  g_object_class_override_property (gobject_class, 1, "hostname1");
-}
-
-/**
- * hostnamed_object_skeleton_new:
- * @object_path: An object path.
- *
- * Creates a new skeleton object.
- *
- * Returns: (transfer full): The skeleton object.
- */
-hostnamedObjectSkeleton *
-hostnamed_object_skeleton_new (const gchar *object_path)
-{
-  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
-  return HOSTNAMED_OBJECT_SKELETON (g_object_new (HOSTNAMED_TYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));
-}
-
-/**
- * hostnamed_object_skeleton_set_hostname1:
- * @object: A #hostnamedObjectSkeleton.
- * @interface_: (allow-none): A #hostnamedHostname1 or %NULL to clear the interface.
- *
- * Sets the #hostnamedHostname1 instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-hostname1.top_of_page">org.freedesktop.hostname1</link> on @object.
- */
-void hostnamed_object_skeleton_set_hostname1 (hostnamedObjectSkeleton *object, hostnamedHostname1 *interface_)
-{
-  g_object_set (G_OBJECT (object), "hostname1", interface_, NULL);
-}
-
-
-/* ------------------------------------------------------------------------
- * Code for ObjectManager client
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:hostnamedObjectManagerClient
- * @title: hostnamedObjectManagerClient
- * @short_description: Generated GDBusObjectManagerClient type
- *
- * This section contains a #GDBusObjectManagerClient that uses hostnamed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.
- */
-
-/**
- * hostnamedObjectManagerClient:
- *
- * The #hostnamedObjectManagerClient structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * hostnamedObjectManagerClientClass:
- * @parent_class: The parent class.
- *
- * Class structure for #hostnamedObjectManagerClient.
- */
-
-G_DEFINE_TYPE (hostnamedObjectManagerClient, hostnamed_object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
-
-static void
-hostnamed_object_manager_client_init (hostnamedObjectManagerClient *manager G_GNUC_UNUSED)
-{
-}
-
-static void
-hostnamed_object_manager_client_class_init (hostnamedObjectManagerClientClass *klass G_GNUC_UNUSED)
-{
-}
-
-/**
- * hostnamed_object_manager_client_get_proxy_type:
- * @manager: A #GDBusObjectManagerClient.
- * @object_path: The object path of the remote object (unused).
- * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
- * @user_data: User data (unused).
- *
- * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy<!-- -->- and #GDBusProxy<!-- -->-derived types.
- *
- * Returns: A #GDBusProxy<!-- -->-derived #GType if @interface_name is not %NULL, otherwise the #GType for #hostnamedObjectProxy.
- */
-GType
-hostnamed_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
-{
-  static gsize once_init_value = 0;
-  static GHashTable *lookup_hash;
-  GType ret;
-
-  if (interface_name == NULL)
-    return HOSTNAMED_TYPE_OBJECT_PROXY;
-  if (g_once_init_enter (&once_init_value))
-    {
-      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (lookup_hash, (gpointer) "org.freedesktop.hostname1", GSIZE_TO_POINTER (HOSTNAMED_TYPE_HOSTNAME1_PROXY));
-      g_once_init_leave (&once_init_value, 1);
-    }
-  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));
-  if (ret == (GType) 0)
-    ret = G_TYPE_DBUS_PROXY;
-  return ret;
-}
-
-/**
- * hostnamed_object_manager_client_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates #GDBusObjectManagerClient using hostnamed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.
- *
- * 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.
- * You can then call hostnamed_object_manager_client_new_finish() to get the result of the operation.
- *
- * See hostnamed_object_manager_client_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-hostnamed_object_manager_client_new (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data)
-{
-  g_async_initable_new_async (HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", hostnamed_object_manager_client_get_proxy_type, NULL);
-}
-
-/**
- * hostnamed_object_manager_client_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to hostnamed_object_manager_client_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with hostnamed_object_manager_client_new().
- *
- * Returns: (transfer full) (type hostnamedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-hostnamed_object_manager_client_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-/**
- * hostnamed_object_manager_client_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates #GDBusObjectManagerClient using hostnamed_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See hostnamed_object_manager_client_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type hostnamedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-hostnamed_object_manager_client_new_sync (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", hostnamed_object_manager_client_get_proxy_type, NULL);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * hostnamed_object_manager_client_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like hostnamed_object_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * 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.
- * You can then call hostnamed_object_manager_client_new_for_bus_finish() to get the result of the operation.
- *
- * See hostnamed_object_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-hostnamed_object_manager_client_new_for_bus (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data)
-{
-  g_async_initable_new_async (HOSTNAMED_TYPE_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", hostnamed_object_manager_client_get_proxy_type, NULL);
-}
-
-/**
- * hostnamed_object_manager_client_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to hostnamed_object_manager_client_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with hostnamed_object_manager_client_new_for_bus().
- *
- * Returns: (transfer full) (type hostnamedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-hostnamed_object_manager_client_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-/**
- * hostnamed_object_manager_client_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like hostnamed_object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See hostnamed_object_manager_client_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type hostnamedObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-hostnamed_object_manager_client_new_for_bus_sync (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", hostnamed_object_manager_client_get_proxy_type, NULL);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-
diff --git a/src/interfaces/hostnamed/hostnamed-gen.h b/src/interfaces/hostnamed/hostnamed-gen.h
index f643816..4200654 100644
--- a/src/interfaces/hostnamed/hostnamed-gen.h
+++ b/src/interfaces/hostnamed/hostnamed-gen.h
@@ -351,148 +351,6 @@ GType hostnamed_hostname1_skeleton_get_type (void) G_GNUC_CONST;
 hostnamedHostname1 *hostnamed_hostname1_skeleton_new (void);
 
 
-/* ---- */
-
-#define HOSTNAMED_TYPE_OBJECT (hostnamed_object_get_type ())
-#define HOSTNAMED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HOSTNAMED_TYPE_OBJECT, hostnamedObject))
-#define HOSTNAMED_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HOSTNAMED_TYPE_OBJECT))
-#define HOSTNAMED_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), HOSTNAMED_TYPE_OBJECT, hostnamedObject))
-
-struct _hostnamedObject;
-typedef struct _hostnamedObject hostnamedObject;
-typedef struct _hostnamedObjectIface hostnamedObjectIface;
-
-struct _hostnamedObjectIface
-{
-  GTypeInterface parent_iface;
-};
-
-GType hostnamed_object_get_type (void) G_GNUC_CONST;
-
-hostnamedHostname1 *hostnamed_object_get_hostname1 (hostnamedObject *object);
-hostnamedHostname1 *hostnamed_object_peek_hostname1 (hostnamedObject *object);
-
-#define HOSTNAMED_TYPE_OBJECT_PROXY (hostnamed_object_proxy_get_type ())
-#define HOSTNAMED_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HOSTNAMED_TYPE_OBJECT_PROXY, hostnamedObjectProxy))
-#define HOSTNAMED_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), HOSTNAMED_TYPE_OBJECT_PROXY, hostnamedObjectProxyClass))
-#define HOSTNAMED_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HOSTNAMED_TYPE_OBJECT_PROXY, hostnamedObjectProxyClass))
-#define HOSTNAMED_IS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HOSTNAMED_TYPE_OBJECT_PROXY))
-#define HOSTNAMED_IS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HOSTNAMED_TYPE_OBJECT_PROXY))
-
-typedef struct _hostnamedObjectProxy hostnamedObjectProxy;
-typedef struct _hostnamedObjectProxyClass hostnamedObjectProxyClass;
-typedef struct _hostnamedObjectProxyPrivate hostnamedObjectProxyPrivate;
-
-struct _hostnamedObjectProxy
-{
-  /*< private >*/
-  GDBusObjectProxy parent_instance;
-  hostnamedObjectProxyPrivate *priv;
-};
-
-struct _hostnamedObjectProxyClass
-{
-  GDBusObjectProxyClass parent_class;
-};
-
-GType hostnamed_object_proxy_get_type (void) G_GNUC_CONST;
-hostnamedObjectProxy *hostnamed_object_proxy_new (GDBusConnection *connection, const gchar *object_path);
-
-#define HOSTNAMED_TYPE_OBJECT_SKELETON (hostnamed_object_skeleton_get_type ())
-#define HOSTNAMED_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HOSTNAMED_TYPE_OBJECT_SKELETON, hostnamedObjectSkeleton))
-#define HOSTNAMED_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), HOSTNAMED_TYPE_OBJECT_SKELETON, hostnamedObjectSkeletonClass))
-#define HOSTNAMED_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HOSTNAMED_TYPE_OBJECT_SKELETON, hostnamedObjectSkeletonClass))
-#define HOSTNAMED_IS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HOSTNAMED_TYPE_OBJECT_SKELETON))
-#define HOSTNAMED_IS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HOSTNAMED_TYPE_OBJECT_SKELETON))
-
-typedef struct _hostnamedObjectSkeleton hostnamedObjectSkeleton;
-typedef struct _hostnamedObjectSkeletonClass hostnamedObjectSkeletonClass;
-typedef struct _hostnamedObjectSkeletonPrivate hostnamedObjectSkeletonPrivate;
-
-struct _hostnamedObjectSkeleton
-{
-  /*< private >*/
-  GDBusObjectSkeleton parent_instance;
-  hostnamedObjectSkeletonPrivate *priv;
-};
-
-struct _hostnamedObjectSkeletonClass
-{
-  GDBusObjectSkeletonClass parent_class;
-};
-
-GType hostnamed_object_skeleton_get_type (void) G_GNUC_CONST;
-hostnamedObjectSkeleton *hostnamed_object_skeleton_new (const gchar *object_path);
-void hostnamed_object_skeleton_set_hostname1 (hostnamedObjectSkeleton *object, hostnamedHostname1 *interface_);
-
-/* ---- */
-
-#define HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT (hostnamed_object_manager_client_get_type ())
-#define HOSTNAMED_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, hostnamedObjectManagerClient))
-#define HOSTNAMED_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, hostnamedObjectManagerClientClass))
-#define HOSTNAMED_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT, hostnamedObjectManagerClientClass))
-#define HOSTNAMED_IS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT))
-#define HOSTNAMED_IS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HOSTNAMED_TYPE_OBJECT_MANAGER_CLIENT))
-
-typedef struct _hostnamedObjectManagerClient hostnamedObjectManagerClient;
-typedef struct _hostnamedObjectManagerClientClass hostnamedObjectManagerClientClass;
-typedef struct _hostnamedObjectManagerClientPrivate hostnamedObjectManagerClientPrivate;
-
-struct _hostnamedObjectManagerClient
-{
-  /*< private >*/
-  GDBusObjectManagerClient parent_instance;
-  hostnamedObjectManagerClientPrivate *priv;
-};
-
-struct _hostnamedObjectManagerClientClass
-{
-  GDBusObjectManagerClientClass parent_class;
-};
-
-GType hostnamed_object_manager_client_get_type (void) G_GNUC_CONST;
-
-GType hostnamed_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);
-
-void hostnamed_object_manager_client_new (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data);
-GDBusObjectManager *hostnamed_object_manager_client_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-GDBusObjectManager *hostnamed_object_manager_client_new_sync (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error);
-
-void hostnamed_object_manager_client_new_for_bus (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data);
-GDBusObjectManager *hostnamed_object_manager_client_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-GDBusObjectManager *hostnamed_object_manager_client_new_for_bus_sync (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error);
-
-
 G_END_DECLS
 
 #endif /* __SRC_INTERFACES_HOSTNAMED_HOSTNAMED_GEN_H__ */
diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 6d06a34..ad7df31 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -138,7 +138,7 @@ our_get_os_pretty_name() {
 
 /* end method/property/signal code, begin bus/name handlers */
 
-static void on_bus_acquired(GDBusConnection *conn,
+static void hostnamed_on_bus_acquired(GDBusConnection *conn,
                             const gchar *name,
                             gpointer user_data) {
 
@@ -146,7 +146,7 @@ static void on_bus_acquired(GDBusConnection *conn,
 
 }
 
-static void on_name_acquired(GDBusConnection *conn,
+static void hostnamed_on_name_acquired(GDBusConnection *conn,
                              const gchar *name,
                              gpointer user_data) {
 
@@ -183,7 +183,7 @@ static void on_name_acquired(GDBusConnection *conn,
 
 }
 
-static void on_name_lost(GDBusConnection *conn,
+static void hostnamed_on_name_lost(GDBusConnection *conn,
                          const gchar *name,
                          gpointer user_data) {
 
@@ -216,9 +216,9 @@ GError *hostnamed_init() {
     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.hostname1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
-                                    on_bus_acquired,
-                                    on_name_acquired,
-                                    on_name_lost,
+                                    hostnamed_on_bus_acquired,
+                                    hostnamed_on_name_acquired,
+                                    hostnamed_on_name_lost,
                                     NULL,
                                     NULL);