diff options
| author | Willem Jan Palenstijn | 2014-10-09 10:10:17 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2014-10-09 10:10:17 +0200 |
| commit | b5536e3a27172842fbfe412097de29f75880afd9 (patch) | |
| tree | a605dfd20e05e08b3acaf139d891c7c108e351f2 | |
| parent | 720a479b97690610f7bb717eb4c0cd0d0a7edc15 (diff) | |
| parent | 2ea3ae9c57a8d601e213030aef6b08b93ee48711 (diff) | |
| download | scummvm-rg350-b5536e3a27172842fbfe412097de29f75880afd9.tar.gz scummvm-rg350-b5536e3a27172842fbfe412097de29f75880afd9.tar.bz2 scummvm-rg350-b5536e3a27172842fbfe412097de29f75880afd9.zip | |
Merge pull request #521 from tobiatesan/sensible_unity
UNITY: Fix runtime dependency on glib > 2.36
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp index 0e034f9f98..532d9656c3 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,12 @@ #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 + if (!glib_check_version(2, 36, 0)) { + g_type_init(); + } _loop = g_main_loop_new(NULL, FALSE); |