diff options
| author | Eugene Sandulenko | 2014-10-06 14:14:36 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-10-06 14:14:36 +0200 |
| commit | f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8 (patch) | |
| tree | 2bcf54dfc3025e09b78b0135bed8a6d06dbe88ad | |
| parent | 65fc33fcc795b1596187dbe93b4adb7166e86541 (diff) | |
| parent | fee66db83dbe2279729ee0a106eda3fa79bc962e (diff) | |
| download | scummvm-rg350-f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8.tar.gz scummvm-rg350-f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8.tar.bz2 scummvm-rg350-f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8.zip | |
Merge pull request #519 from tobiatesan/sensible_unity
UNITY: Call g_type_init only with GLib < 2.36
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 6 |
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); |