From e96cba8bf384f55d73c99f637d2d9a96ecbc6779 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Mon, 6 Oct 2014 16:23:24 +0200
Subject: UNITY: Call g_type_init but define DISABLE_DEPRECATION_WARNINGS

---
 backends/taskbar/unity/unity-taskbar.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'backends/taskbar')

diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 0e034f9f98..6673e61eaa 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -26,6 +26,8 @@
 
 #if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY)
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "backends/taskbar/unity/unity-taskbar.h"
 
 #include "common/textconsole.h"
@@ -33,13 +35,10 @@
 #include <unity.h>
 
 UnityTaskbarManager::UnityTaskbarManager() {
-#if GLIB_CHECK_VERSION(2, 36, 0) == FALSE
 	/*
-	 *  Glib version is < 2.36.0, it still needs g_type_init(),
-	 *  deprecated in later versions
+	 *  Deprecated in Glib >= 2.36.0
 	 */
 	g_type_init();
-#endif
 
 	_loop = g_main_loop_new(NULL, FALSE);
 
-- 
cgit v1.2.3