Merge pull request #519 from tobiatesan/sensible_unity

UNITY: Call g_type_init only with GLib < 2.36
scummvm · Oct 6, 2014 · f811e4e · f811e4e
2 parents 65fc33f + fee66db
commit f811e4e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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);