Require GLib 2.32

This avoids compilation failing because the new(ish) g_thread_new
wasn't available in our target version. telepathy-gabble indirectly
depends on GLib 2.32 anyway, via telepathy-glib 0.20.

Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>

5 files changed, 0 insertions, 21 deletions

diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c
index c6914f0..2bd575e 100644
--- a/tests/wocky-connector-test.c
+++ b/tests/wocky-connector-test.c
@@ -71,11 +71,6 @@
 #define OK 0
 #define CONNECTOR_OK { OK, OK, OK, OK, OK, OK }
 
-#if ! GLIB_CHECK_VERSION(2, 26, 0)
-#  define G_IO_ERROR_CONNECTION_REFUSED -1
-#  define G_IO_ERROR_NETWORK_UNREACHABLE -1
-#endif
-
 static GError *error = NULL;
 static GResolver *original;
 static GResolver *kludged;
diff --git a/tests/wocky-dummy-xmpp-server.c b/tests/wocky-dummy-xmpp-server.c
index 71ea935..be947b0 100644
--- a/tests/wocky-dummy-xmpp-server.c
+++ b/tests/wocky-dummy-xmpp-server.c
@@ -87,10 +87,6 @@ main (int argc,
 
   memset (&server, 0, sizeof (server));
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  g_thread_init (NULL);
-#endif
-
   g_type_init ();
 
   loop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/wocky-http-proxy-test.c b/tests/wocky-http-proxy-test.c
index eb48b29..ce9a854 100644
--- a/tests/wocky-http-proxy-test.c
+++ b/tests/wocky-http-proxy-test.c
@@ -111,11 +111,7 @@ static void
 run_in_thread (HttpTestData *data,
     GThreadFunc func)
 {
-#if GLIB_CHECK_VERSION (2, 31, 0)
   data->thread = g_thread_new ("server_thread", func, data);
-#else
-  data->thread = g_thread_create (func, data, TRUE, NULL);
-#endif
   g_assert (data->thread != NULL);
 }
 
diff --git a/tests/wocky-sasl-utils-test.c b/tests/wocky-sasl-utils-test.c
index 06287d0..e384811 100644
--- a/tests/wocky-sasl-utils-test.c
+++ b/tests/wocky-sasl-utils-test.c
@@ -151,10 +151,6 @@ main (int argc,
 {
   int i;
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  g_thread_init (NULL);
-#endif
-
   g_test_init (&argc, &argv, NULL);
 
   for (i = 0 ; hmac_sha1_tests[i].key_len > 0 ; i++)
diff --git a/tests/wocky-test-helper.c b/tests/wocky-test-helper.c
index 629ff6f..d2b262e 100644
--- a/tests/wocky-test-helper.c
+++ b/tests/wocky-test-helper.c
@@ -294,10 +294,6 @@ void
 test_init (int argc,
     char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-  g_thread_init (NULL);
-#endif
-
   g_test_init (&argc, &argv, NULL);
   g_test_bug_base ("http://bugs.freedesktop.org/show_bug.cgi?id=");
   g_type_init ();