From ca179625f89edf6a118eb9e934a89de4ed4b720b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sat, 3 Dec 2011 13:58:51 +0000
Subject: [PATCH] g_thread_create() is deprecated in GLib master, use
 g_thread_try_new() instead

---
 gst/gstsystemclock.c              |  6 ++++++
 libs/gst/check/gstcheck.h         | 11 +++++++++++
 libs/gst/net/gstnetclientclock.c  |  8 +++++++-
 libs/gst/net/gstnettimeprovider.c |  8 +++++++-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c
index ef691fd..2c71489 100644
--- a/gst/gstsystemclock.c
+++ b/gst/gstsystemclock.c
@@ -735,8 +735,14 @@ gst_system_clock_start_async (GstSystemClock * clock)
   if (G_LIKELY (clock->thread != NULL))
     return TRUE;                /* Thread already running. Nothing to do */
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   clock->thread = g_thread_create ((GThreadFunc) gst_system_clock_async_thread,
       clock, TRUE, &error);
+#else
+  clock->thread = g_thread_try_new ("GstSystemClock",
+      (GThreadFunc) gst_system_clock_async_thread, clock, &error);
+#endif
+
   if (G_UNLIKELY (error))
     goto no_thread;
 
diff --git a/libs/gst/check/gstcheck.h b/libs/gst/check/gstcheck.h
index 004eb74..e77c007 100644
--- a/libs/gst/check/gstcheck.h
+++ b/libs/gst/check/gstcheck.h
@@ -277,6 +277,17 @@ MAIN_INIT();							\
 MAIN_START_THREAD_FUNCTIONS(count, function, data);		\
 MAIN_SYNCHRONIZE();
 
+#if GLIB_CHECK_VERSION (2, 31, 0)
+#define g_thread_create gst_g_thread_create
+static inline GThread *
+gst_g_thread_create (GThreadFunc func, gpointer data, gboolean joinable,
+    GError **error)
+{
+  g_assert (joinable);
+  return g_thread_try_new ("gst-check", func, data, error);
+}
+#endif
+
 #define MAIN_INIT()			\
 G_STMT_START {				\
   _gst_check_threads_running = TRUE;	\
diff --git a/libs/gst/net/gstnetclientclock.c b/libs/gst/net/gstnetclientclock.c
index dcaa975..dc56b4f 100644
--- a/libs/gst/net/gstnetclientclock.c
+++ b/libs/gst/net/gstnetclientclock.c
@@ -457,9 +457,15 @@ gst_net_client_clock_start (GstNetClientClock * self)
   gst_poll_add_fd (self->priv->fdset, &self->priv->sock);
   gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE);
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   self->thread = g_thread_create (gst_net_client_clock_thread, self, TRUE,
       &error);
-  if (!self->thread)
+#else
+  self->thread = g_thread_try_new ("GstNetClientClock",
+      gst_net_client_clock_thread, self, &error);
+#endif
+
+  if (error != NULL)
     goto no_thread;
 
   return TRUE;
diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c
index b04d282..8e3e7f6 100644
--- a/libs/gst/net/gstnettimeprovider.c
+++ b/libs/gst/net/gstnettimeprovider.c
@@ -403,9 +403,15 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
   gst_poll_add_fd (self->priv->fdset, &self->priv->sock);
   gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE);
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   self->thread = g_thread_create (gst_net_time_provider_thread, self, TRUE,
       &error);
-  if (!self->thread)
+#else
+  self->thread = g_thread_try_new ("GstNetTimeProvider",
+      gst_net_time_provider_thread, self, &error);
+#endif
+
+  if (error != NULL)
     goto no_thread;
 
   return TRUE;
-- 
2.7.4