Imported Upstream version 2.59.0

[platform/upstream/glib.git] / gio / tests / gdbus-example-objectmanager-server.c

diff --git a/gio/tests/gdbus-example-objectmanager-server.c b/gio/tests/gdbus-example-objectmanager-server.c
index 0ef9c49..c460e66 100644 (file)
--- a/gio/tests/gdbus-example-objectmanager-server.c
+++ b/gio/tests/gdbus-example-objectmanager-server.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -68,7 +68,7 @@ on_bus_acquired (GDBusConnection *connection,
   g_print ("Acquired a message bus connection\n");
 
   /* Create a new org.freedesktop.DBus.ObjectManager rooted at /example/Animals */
-  manager = g_dbus_object_manager_server_new (connection, "/example/Animals");
+  manager = g_dbus_object_manager_server_new ("/example/Animals");
 
   for (n = 0; n < 10; n++)
     {
@@ -111,6 +111,9 @@ on_bus_acquired (GDBusConnection *connection,
       g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
       g_object_unref (object);
     }
+
+  /* Export all objects */
+  g_dbus_object_manager_server_set_connection (manager, connection);
 }
 
 static void
@@ -136,8 +139,6 @@ main (gint argc, gchar *argv[])
   GMainLoop *loop;
   guint id;
 
-  g_type_init ();
-
   loop = g_main_loop_new (NULL, FALSE);
 
   id = g_bus_own_name (G_BUS_TYPE_SESSION,