diff options
Diffstat (limited to 'backends/taskbar/unity')
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 11 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp index f36e2bf628..532d9656c3 100644 --- a/backends/taskbar/unity/unity-taskbar.cpp +++ b/backends/taskbar/unity/unity-taskbar.cpp @@ -24,7 +24,9 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h #include "common/scummsys.h" -#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY) + +#define GLIB_DISABLE_DEPRECATION_WARNINGS #include "backends/taskbar/unity/unity-taskbar.h" @@ -33,7 +35,12 @@ #include <unity.h> UnityTaskbarManager::UnityTaskbarManager() { - g_type_init(); + /* + * Deprecated in Glib >= 2.36.0 + */ + if (!glib_check_version(2, 36, 0)) { + g_type_init(); + } _loop = g_main_loop_new(NULL, FALSE); diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h index d1d9430bcd..d818ed9ff1 100644 --- a/backends/taskbar/unity/unity-taskbar.h +++ b/backends/taskbar/unity/unity-taskbar.h @@ -23,7 +23,7 @@ #ifndef BACKEND_UNITY_TASKBAR_H #define BACKEND_UNITY_TASKBAR_H -#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) +#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY) #include "common/events.h" #include "common/str.h" |