[Xfce4-commits] [apps/xfce4-screensaver] 168/425: Add back Glib 2.32 support

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit ddc4152abebd61f14055dec8c2f7c4c1e0d2ddd0
Author: infirit <infirit at gmail.com>
Date:   Tue Dec 16 12:23:08 2014 +0100

    Add back Glib 2.32 support
---
 src/mate-screensaver-command.c   | 4 ++++
 src/mate-screensaver-dialog.c    | 4 ++++
 src/mate-screensaver-gl-helper.c | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/src/mate-screensaver-command.c b/src/mate-screensaver-command.c
index d4f7657..a87ea55 100644
--- a/src/mate-screensaver-command.c
+++ b/src/mate-screensaver-command.c
@@ -499,6 +499,10 @@ main (int    argc,
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+	g_type_init ();
+#endif
+
 	g_set_prgname (argv[0]);
 
 	if (setlocale (LC_ALL, "") == NULL)
diff --git a/src/mate-screensaver-dialog.c b/src/mate-screensaver-dialog.c
index 79be649..6b23baa 100644
--- a/src/mate-screensaver-dialog.c
+++ b/src/mate-screensaver-dialog.c
@@ -560,6 +560,10 @@ int main(int argc, char** argv)
 		textdomain(GETTEXT_PACKAGE);
 	#endif
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+	g_type_init();
+#endif
+
 	gs_profile_start(NULL);
 
 	if (!privileged_initialization(&argc, argv, verbose))
diff --git a/src/mate-screensaver-gl-helper.c b/src/mate-screensaver-gl-helper.c
index acf23ef..daaa179 100644
--- a/src/mate-screensaver-gl-helper.c
+++ b/src/mate-screensaver-gl-helper.c
@@ -48,6 +48,10 @@ main (int    argc,
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+	g_type_init ();
+#endif
+
 	g_set_prgname (argv[0]);
 	if (! gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error))
 	{

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.