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

sev- sev at scummvm.org
Mon Oct 6 14:15:09 CEST 2014


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

Summary:
fee66db83d UNITY: Call g_type_init only with GLib < 2.36
f811e4ef5e Merge pull request #519 from tobiatesan/sensible_unity


Commit: fee66db83dbe2279729ee0a106eda3fa79bc962e
    https://github.com/scummvm/scummvm/commit/fee66db83dbe2279729ee0a106eda3fa79bc962e
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-10-05T17:05:08+02:00

Commit Message:
UNITY: Call g_type_init only with GLib < 2.36

With GLib >= 2.36 g_type_init() is deprecated and only throws an ugly
warning

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 1b82e58..0e034f9 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);
 


Commit: f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8
    https://github.com/scummvm/scummvm/commit/f811e4ef5e08d5d0bfec3d29726d3a745ac3ddb8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-06T14:14:36+02:00

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

UNITY: Call g_type_init only with GLib < 2.36

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









More information about the Scummvm-git-logs mailing list