aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar
diff options
context:
space:
mode:
authorTobia Tesan2014-10-06 16:29:37 +0200
committerTobia Tesan2014-10-06 16:50:32 +0200
commit2ea3ae9c57a8d601e213030aef6b08b93ee48711 (patch)
treec4fc2c67db2c96e2ab2ef7f6f39b90b55a86ac95 /backends/taskbar
parente96cba8bf384f55d73c99f637d2d9a96ecbc6779 (diff)
downloadscummvm-rg350-2ea3ae9c57a8d601e213030aef6b08b93ee48711.tar.gz
scummvm-rg350-2ea3ae9c57a8d601e213030aef6b08b93ee48711.tar.bz2
scummvm-rg350-2ea3ae9c57a8d601e213030aef6b08b93ee48711.zip
UNITY: Check for GLib version at runtime
g_type_init() is deprecated since 2.36
Diffstat (limited to 'backends/taskbar')
-rw-r--r--backends/taskbar/unity/unity-taskbar.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 6673e61eaa..532d9656c3 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -38,7 +38,9 @@ UnityTaskbarManager::UnityTaskbarManager() {
/*
* Deprecated in Glib >= 2.36.0
*/
- g_type_init();
+ if (!glib_check_version(2, 36, 0)) {
+ g_type_init();
+ }
_loop = g_main_loop_new(NULL, FALSE);