diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-09 14:43:49 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-09 14:43:49 +0000 |
| commit | fa9065942e51cac4bf3927d7c38e350457ae085a (patch) | |
| tree | 2b35b9a9db36b2bf5b79c4fadb0bd3a8c0614935 /test | |
| parent | b5528d7ff526d700aab5b9e11aed871180d4f81e (diff) | |
| download | dbus-glib-fa9065942e51cac4bf3927d7c38e350457ae085a.tar.gz | |
Stop calling g_thread_init or linking libgthread-2.0
Since GLib 2.32, which we now depend on, this is unnecessary.
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/peer-client.c | 2 | ||||
| -rw-r--r-- | test/core/peer-server.c | 2 | ||||
| -rw-r--r-- | test/core/test-profile.c | 1 | ||||
| -rw-r--r-- | test/core/test-service-glib.c | 2 | ||||
| -rw-r--r-- | test/core/test-thread-client.c | 1 | ||||
| -rw-r--r-- | test/core/test-thread-server.c | 1 |
6 files changed, 3 insertions, 6 deletions
diff --git a/test/core/peer-client.c b/test/core/peer-client.c index 95a7db4..9a944f1 100644 --- a/test/core/peer-client.c +++ b/test/core/peer-client.c @@ -77,7 +77,7 @@ main (int argc, char **argv) gsize lineoffset; GIOChannel *io; - g_thread_init (NULL); dbus_g_thread_init (); + dbus_g_thread_init (); g_type_init (); io = g_io_channel_unix_new (0); diff --git a/test/core/peer-server.c b/test/core/peer-server.c index 7e59625..b44daac 100644 --- a/test/core/peer-server.c +++ b/test/core/peer-server.c @@ -34,7 +34,7 @@ main (int argc, char **argv) dbus_error_init (&error); - g_thread_init (NULL); dbus_g_thread_init (); + dbus_g_thread_init (); g_type_init (); loop = g_main_loop_new (NULL, TRUE); diff --git a/test/core/test-profile.c b/test/core/test-profile.c index cf20bb1..fe2f476 100644 --- a/test/core/test-profile.c +++ b/test/core/test-profile.c @@ -1095,7 +1095,6 @@ main (int argc, char *argv[]) #endif #ifndef TEST_PROFILE_DISABLED - g_thread_init (NULL); dbus_g_thread_init (); #ifndef G_DISABLE_ASSERT diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c index 0568e40..8da330a 100644 --- a/test/core/test-service-glib.c +++ b/test/core/test-service-glib.c @@ -31,7 +31,7 @@ main (int argc, char **argv) guint32 request_name_ret; g_type_init (); - g_thread_init (NULL); dbus_g_thread_init (); + dbus_g_thread_init (); dbus_g_error_domain_register (MY_OBJECT_ERROR, NULL, diff --git a/test/core/test-thread-client.c b/test/core/test-thread-client.c index ef8a3ef..ad53c7d 100644 --- a/test/core/test-thread-client.c +++ b/test/core/test-thread-client.c @@ -67,7 +67,6 @@ main (int argc, char *argv[]) DBusError error; int i; - g_thread_init (NULL); dbus_g_thread_init (); if(argc < 2) diff --git a/test/core/test-thread-server.c b/test/core/test-thread-server.c index 578b66d..6f0abf0 100644 --- a/test/core/test-thread-server.c +++ b/test/core/test-thread-server.c @@ -180,7 +180,6 @@ main (int argc, char *argv[]) DBusServer *server; DBusError error; - g_thread_init (NULL); dbus_g_thread_init (); if (argc < 2) |