[Scummvm-cvs-logs] scummvm master -> b5536e3a27172842fbfe412097de29f75880afd9

[wjp]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e96cba8bf3 UNITY: Call g_type_init but define DISABLE_DEPRECATION_WARNINGS
2ea3ae9c57 UNITY: Check for GLib version at runtime
b5536e3a27 Merge pull request #521 from tobiatesan/sensible_unity


Commit: e96cba8bf384f55d73c99f637d2d9a96ecbc6779
    https://github.com/scummvm/scummvm/commit/e96cba8bf384f55d73c99f637d2d9a96ecbc6779
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-10-06T16:26:28+02:00

Commit Message:
UNITY: Call g_type_init but define DISABLE_DEPRECATION_WARNINGS

Changed paths:
    backends/taskbar/unity/unity-taskbar.cpp



diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 0e034f9..6673e61 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);
 


Commit: 2ea3ae9c57a8d601e213030aef6b08b93ee48711
    https://github.com/scummvm/scummvm/commit/2ea3ae9c57a8d601e213030aef6b08b93ee48711
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-10-06T16:50:32+02:00

Commit Message:
UNITY: Check for GLib version at runtime

g_type_init() is deprecated since 2.36

Changed paths:
    backends/taskbar/unity/unity-taskbar.cpp



diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 6673e61..532d965 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);
 


Commit: b5536e3a27172842fbfe412097de29f75880afd9
    https://github.com/scummvm/scummvm/commit/b5536e3a27172842fbfe412097de29f75880afd9
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-10-09T10:10:17+02:00

Commit Message:
Merge pull request #521 from tobiatesan/sensible_unity

UNITY: Fix runtime dependency on glib > 2.36

Changed paths:
    backends/taskbar/unity/unity-taskbar.cpp