aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar/unity
diff options
context:
space:
mode:
authorTobia Tesan2014-10-06 16:23:24 +0200
committerTobia Tesan2014-10-06 16:26:28 +0200
commite96cba8bf384f55d73c99f637d2d9a96ecbc6779 (patch)
tree9c5b51cd266a83dbfeb08ff67ff237adbd380f8a /backends/taskbar/unity
parentfee66db83dbe2279729ee0a106eda3fa79bc962e (diff)
downloadscummvm-rg350-e96cba8bf384f55d73c99f637d2d9a96ecbc6779.tar.gz
scummvm-rg350-e96cba8bf384f55d73c99f637d2d9a96ecbc6779.tar.bz2
scummvm-rg350-e96cba8bf384f55d73c99f637d2d9a96ecbc6779.zip
UNITY: Call g_type_init but define DISABLE_DEPRECATION_WARNINGS
Diffstat (limited to 'backends/taskbar/unity')
-rw-r--r--backends/taskbar/unity/unity-taskbar.cpp7
1 files changed, 3 insertions, 4 deletions
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);