[poppler] glib/demo

[Carlos Garcia Campos]

 glib/demo/main.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c9da140bb476dcbb3928950ae9b506de82695cd2
Author: David King <amigadave at amigadave.com>
Date:   Thu Oct 20 11:31:10 2011 +0200

    glib-demo: Conditionally initialise threading
    
    In GLib 2.24.0 and above, threading is enabled by default, and the
    thread initialization functions are deprecated since GLib 2.31.0.
    
    Fixes bug #42036.

diff --git a/glib/demo/main.c b/glib/demo/main.c
index 4b9a536..b531bad 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.24.0 */
+#if !GLIB_CHECK_VERSION (2, 24, 0)
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
+#endif
 
 	gtk_init (&argc, &argv);