From: Martin Willi <martin@revosec.ch>
Date: Thu, 18 Jul 2013 12:21:17 +0000 (+0200)
Subject: nm: omit deprecated g_type_init() when using >= GLIB 2.36
X-Git-Tag: 5.1.0rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896abbefc5f9d7dd97a5f591fc033f307f38172e;p=thirdparty%2Fstrongswan.git

nm: omit deprecated g_type_init() when using >= GLIB 2.36
---

diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
index c83978291e..f474dad60d 100644
--- a/src/charon-nm/nm/nm_backend.c
+++ b/src/charon-nm/nm/nm_backend.c
@@ -116,7 +116,9 @@ static bool nm_backend_init()
 {
 	nm_backend_t *this;
 
+#if !GLIB_CHECK_VERSION(2,36,0)
 	g_type_init ();
+#endif
 
 #if !GLIB_CHECK_VERSION(2,23,0)
 	if (!g_thread_supported())