From fee66db83dbe2279729ee0a106eda3fa79bc962e Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sun, 5 Oct 2014 17:05:08 +0200
Subject: UNITY: Call g_type_init only with GLib < 2.36

With GLib >= 2.36 g_type_init() is deprecated and only throws an ugly
warning
---
 backends/taskbar/unity/unity-taskbar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'backends')

diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 1b82e58c8a..0e034f9f98 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -33,7 +33,13 @@
 #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
+	 */
 	g_type_init();
+#endif
 
 	_loop = g_main_loop_new(NULL, FALSE);
 
-- 
cgit v1.2.3