From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Oct 2011 09:42:48 +0200 Subject: Call g_thread_init() conditionally --- shell/main.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'shell') diff --git a/shell/main.c b/shell/main.c index bb056e3ded..5b76a2ed0b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -492,8 +492,10 @@ main (gint argc, textdomain (GETTEXT_PACKAGE); g_type_init (); + #if !GLIB_CHECK_VERSION(2,31,0) if (!g_thread_get_initialized ()) g_thread_init (NULL); + #endif /* do not require Gtk+ for --force-shutdown */ if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) { -- cgit v1.2.3