From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 24 Jan 2013 17:17:27 +0000 (+0100)
Subject: g_thread_init() is deprecated since Glib 2.23
X-Git-Tag: 5.0.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c6a601769c0c642acbfd28c2924fef3140b2b1;p=thirdparty%2Fstrongswan.git

g_thread_init() is deprecated since Glib 2.23
---

diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
index f36cf1f685..5bb2ed9300 100644
--- a/src/charon-nm/nm/nm_backend.c
+++ b/src/charon-nm/nm/nm_backend.c
@@ -117,10 +117,13 @@ static bool nm_backend_init()
 	nm_backend_t *this;
 
 	g_type_init ();
+
+#if !GLIB_CHECK_VERSION(2,23,0)
 	if (!g_thread_supported())
 	{
 		g_thread_init(NULL);
 	}
+#endif
 
 	INIT(this,
 		.creds = nm_creds_create(),
diff --git a/src/libstrongswan/plugins/soup/soup_plugin.c b/src/libstrongswan/plugins/soup/soup_plugin.c
index b21b28b9f6..1260a5a60c 100644
--- a/src/libstrongswan/plugins/soup/soup_plugin.c
+++ b/src/libstrongswan/plugins/soup/soup_plugin.c
@@ -66,10 +66,13 @@ plugin_t *soup_plugin_create()
 	private_soup_plugin_t *this;
 
 	g_type_init();
+
+#if !GLIB_CHECK_VERSION(2,23,0)
 	if (!g_thread_get_initialized())
 	{
 		g_thread_init(NULL);
 	}
+#endif
 
 	INIT(this,
 		.public = {