From d5b619b89fa23cce417bec515fb98d9896bb0e79 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Thu, 20 Oct 2011 11:31:10 +0200
Subject: [PATCH] glib-demo: Conditionally initialise threading

In GLib 2.31.0 and above, threading is enabled by default, and the
thread initialization functions are deprecated.

Fixes bug 42036.
---
 glib/demo/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/glib/demo/main.c b/glib/demo/main.c
index 4b9a536..e03956e 100644
--- a/glib/demo/main.c
+++ b/glib/demo/main.c
@@ -300,8 +300,11 @@ gint main (gint argc, gchar **argv)
 		return 1;
 	}
 
+/* Threading is always enabled starting from GLib 2.31.0, bug 42036. */
+#if !GLIB_CHECK_VERSION (2, 31, 0)
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
+#endif
 
 	gtk_init (&argc, &argv);
 
-- 
1.7.3.4