diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-12 02:41:37 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-12 09:46:27 +0000 |
| commit | 72fc3d1bd92d62aff11e9ad5a6b7e89139a0f4c9 (patch) | |
| tree | c3dd47e7d85c2a52e8d4f071257d6b1a9411afb3 | |
| parent | 330d9842884e701822fd2644f179c0e4113074f5 (diff) | |
tests: g_thread_init() is deprecated in glib master
It's not needed any longer.
| -rw-r--r-- | tests/check/elements/souphttpsrc.c | 3 | ||||
| -rw-r--r-- | tests/icles/equalizer-test.c | 2 | ||||
| -rw-r--r-- | tests/icles/gdkpixbufsink-test.c | 2 | ||||
| -rw-r--r-- | tests/icles/test-oss4.c | 2 | ||||
| -rw-r--r-- | tests/icles/videocrop-test.c | 2 |
5 files changed, 11 insertions, 0 deletions
diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c index ba1574594..7a1b67771 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 e8126fad3..fc6d5273e 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 b09fe09a2..425e47053 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 f15875d7b..233e891fd 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 a4874e160..cc8f8d04c 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 (""); |