Convert a few tests to only use dbus-gmain

Signed-off-by: Simon McVittie <smcv@debian.org>

3 files changed, 3 insertions, 7 deletions

diff --git a/test/core/30574.c b/test/core/30574.c
index 89d54f4..2cf1e21 100644
--- a/test/core/30574.c
+++ b/test/core/30574.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <dbus/dbus.h>
 #include <glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-gmain.h>
 #include "test/lib/util.h"
 
 DBusConnection *bus;
diff --git a/test/core/test-thread-client.c b/test/core/test-thread-client.c
index ad53c7d..e246a33 100644
--- a/test/core/test-thread-client.c
+++ b/test/core/test-thread-client.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include <glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-gmain.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -67,8 +67,6 @@ main (int argc, char *argv[])
   DBusError error;
   int i;
 
-  dbus_g_thread_init ();
-
   if(argc < 2)
     {
       g_error("Need an address as argv[1]\n");
diff --git a/test/core/test-thread-server.c b/test/core/test-thread-server.c
index 6f0abf0..33fb08c 100644
--- a/test/core/test-thread-server.c
+++ b/test/core/test-thread-server.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include <glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-gmain.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -180,8 +180,6 @@ main (int argc, char *argv[])
   DBusServer *server;
   DBusError error;
 
-  dbus_g_thread_init ();
-  
   if (argc < 2)
     {
       fprintf (stderr, "Give the server address as an argument\n");