aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar
diff options
context:
space:
mode:
authorTobia Tesan2014-10-05 17:05:08 +0200
committerTobia Tesan2014-10-05 17:05:08 +0200
commitfee66db83dbe2279729ee0a106eda3fa79bc962e (patch)
tree7664f1fe9db3a7cadac4abf2923c07941358a766 /backends/taskbar
parent2f4f7d480e740c0f10816011f8e9876f29f875fd (diff)
downloadscummvm-rg350-fee66db83dbe2279729ee0a106eda3fa79bc962e.tar.gz
scummvm-rg350-fee66db83dbe2279729ee0a106eda3fa79bc962e.tar.bz2
scummvm-rg350-fee66db83dbe2279729ee0a106eda3fa79bc962e.zip
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
Diffstat (limited to 'backends/taskbar')
-rw-r--r--backends/taskbar/unity/unity-taskbar.cpp6
1 files changed, 6 insertions, 0 deletions
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);