Fix tests to compile again - add missing headers to W32, call correct process-id...

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

diff --git a/gio/tests/gdbus-example-objectmanager-client.c b/gio/tests/gdbus-example-objectmanager-client.c
index 19a3c82..b235ca1 100644 (file)
--- a/gio/tests/gdbus-example-objectmanager-client.c
+++ b/gio/tests/gdbus-example-objectmanager-client.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -13,12 +13,12 @@ print_objects (GDBusObjectManager *manager)
   objects = g_dbus_object_manager_get_objects (manager);
   for (l = objects; l != NULL; l = l->next)
     {
-      GDBusObject *object = G_DBUS_OBJECT (l->data);
+      ExampleObject *object = EXAMPLE_OBJECT (l->data);
       GList *interfaces;
       GList *ll;
-      g_print (" - Object at %s\n", g_dbus_object_get_object_path (object));
+      g_print (" - Object at %s\n", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
 
-      interfaces = g_dbus_object_get_interfaces (object);
+      interfaces = g_dbus_object_get_interfaces (G_DBUS_OBJECT (object));
       for (ll = interfaces; ll != NULL; ll = ll->next)
         {
           GDBusInterface *interface = G_DBUS_INTERFACE (ll->data);
@@ -42,11 +42,9 @@ print_objects (GDBusObjectManager *manager)
            * can be used to get the value of the :Mood property.
            */
         }
-      g_list_foreach (interfaces, (GFunc) g_object_unref, NULL);
-      g_list_free (interfaces);
+      g_list_free_full (interfaces, g_object_unref);
     }
-  g_list_foreach (objects, (GFunc) g_object_unref, NULL);
-  g_list_free (objects);
+  g_list_free_full (objects, g_object_unref);
 }
 
 static void
@@ -119,8 +117,6 @@ main (gint argc, gchar *argv[])
   manager = NULL;
   loop = NULL;
 
-  g_type_init ();
-
   loop = g_main_loop_new (NULL, FALSE);
 
   error = NULL;