From 72fc3d1bd92d62aff11e9ad5a6b7e89139a0f4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Mon, 12 Dec 2011 02:41:37 +0000
Subject: [PATCH] tests: g_thread_init() is deprecated in glib master

It's not needed any longer.
---
 tests/check/elements/souphttpsrc.c | 3 +++
 tests/icles/equalizer-test.c       | 2 ++
 tests/icles/gdkpixbufsink-test.c   | 2 ++
 tests/icles/test-oss4.c            | 2 ++
 tests/icles/videocrop-test.c       | 2 ++
 5 files changed, 11 insertions(+)

diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
index ba1574594c..7a1b677714 100644
--- a/tests/check/elements/souphttpsrc.c
+++ b/tests/check/elements/souphttpsrc.c
@@ -442,8 +442,11 @@ souphttpsrc_suite (void)
   TCase *tc_chain, *tc_internet;
 
   g_type_init ();
+
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   s = suite_create ("souphttpsrc");
   tc_chain = tcase_create ("general");
diff --git a/tests/icles/equalizer-test.c b/tests/icles/equalizer-test.c
index e8126fad3a..fc6d5273ea 100644
--- a/tests/icles/equalizer-test.c
+++ b/tests/icles/equalizer-test.c
@@ -179,8 +179,10 @@ main (int argc, char **argv)
   GstPad *eq_sinkpad;
   gchar *uri;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   /* command line option parsing */
   ctx = g_option_context_new ("FILENAME");
diff --git a/tests/icles/gdkpixbufsink-test.c b/tests/icles/gdkpixbufsink-test.c
index b09fe09a2d..425e47053c 100644
--- a/tests/icles/gdkpixbufsink-test.c
+++ b/tests/icles/gdkpixbufsink-test.c
@@ -329,8 +329,10 @@ main (int argc, char **argv)
   GOptionContext *ctx;
   GError *opt_err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   gtk_init (&argc, &argv);
 
diff --git a/tests/icles/test-oss4.c b/tests/icles/test-oss4.c
index f15875d7bc..233e891fd9 100644
--- a/tests/icles/test-oss4.c
+++ b/tests/icles/test-oss4.c
@@ -233,8 +233,10 @@ main (int argc, char **argv)
   GOptionContext *ctx;
   GError *err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c
index a4874e160a..cc8f8d04cc 100644
--- a/tests/icles/videocrop-test.c
+++ b/tests/icles/videocrop-test.c
@@ -193,8 +193,10 @@ main (int argc, char **argv)
   GstCaps *filter_caps = NULL;
   GList *caps_list, *l;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   /* command line option parsing */
   ctx = g_option_context_new ("");