Compiler warning fixes.

g_thread_init is automatically called since 2.32 (and deprecated since 2.35).
g_type_init is automatically called since 2.36 and will be deprecated in the
future.

indra/plugins/filepicker/legacy.cpp

@@ -70,7 +70,9 @@ namespace LLWindowSDL {
 		if (!tried_gtk_init)
 		{
 			tried_gtk_init = TRUE;
+#if !GLIB_CHECK_VERSION(2, 32, 0)
 			if (!g_thread_supported ()) g_thread_init (NULL);
+#endif
 			//maybe_lock_display();
 			gtk_is_good = gtk_init_check(NULL, NULL);
 			//maybe_unlock_display();

indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp

@@ -793,10 +793,13 @@ MediaPluginGStreamer010::startup()
 	// only do global GStreamer initialization once.
 	if (!mDoneInit)
 	{
-		g_thread_init(NULL);
-
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+#if !GLIB_CHECK_VERSION(2, 32, 0)
+		if (!g_thread_supported()) g_thread_init(NULL);
+#endif
 		// Init the glib type system - we need it.
 		g_type_init();
+#endif
 		set_gst_plugin_path();
 
 

indra/plugins/webkit/linux_volume_catcher.cpp

@@ -227,9 +227,13 @@ void VolumeCatcherImpl::init()
 	mGotSyms = loadsyms("libpulse-mainloop-glib.so.0");
 	if (!mGotSyms) return;
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+#if !GLIB_CHECK_VERSION(2, 32, 0)
 	// better make double-sure glib itself is initialized properly.
 	if (!g_thread_supported ()) g_thread_init (NULL);
+#endif
 	g_type_init();
+#endif
 
 	mMainloop = llpa_glib_mainloop_new(g_main_context_default());
 	if (mMainloop)

indra/plugins/webkit/media_plugin_webkit.cpp

@@ -229,12 +229,16 @@ private:
 		std::string application_dir = std::string( cwd );
 
 #if LL_LINUX
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+#if !GLIB_CHECK_VERSION(2, 32, 0)
 		// take care to initialize glib properly, because some
 		// versions of Qt don't, and we indirectly need it for (some
 		// versions of) Flash to not crash the browser.
 		if (!g_thread_supported ()) g_thread_init (NULL);
+#endif
 		g_type_init();
 #endif
+#endif
 
 #if LL_DARWIN
 		// When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.