summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 13:09:43 +0100
committerinfirit <[email protected]>2014-12-16 13:09:43 +0100
commitb30f374584e6d80cb7f3e6fc83aa07768547e92f (patch)
tree620e6cc6c9b95d5ec44199abfa53140d966d267e
parent0e9379b3e1f4cca21448267472e1deb01da7e5ab (diff)
downloadmate-screensaver-b30f374584e6d80cb7f3e6fc83aa07768547e92f.tar.bz2
mate-screensaver-b30f374584e6d80cb7f3e6fc83aa07768547e92f.tar.xz
Revert "Add back Glib 2.32 support"
This reverts commit ddc4152abebd61f14055dec8c2f7c4c1e0d2ddd0.
-rw-r--r--src/mate-screensaver-command.c4
-rw-r--r--src/mate-screensaver-dialog.c4
-rw-r--r--src/mate-screensaver-gl-helper.c4
3 files changed, 0 insertions, 12 deletions
diff --git a/src/mate-screensaver-command.c b/src/mate-screensaver-command.c
index a87ea55..d4f7657 100644
--- a/src/mate-screensaver-command.c
+++ b/src/mate-screensaver-command.c
@@ -499,10 +499,6 @@ 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 6b23baa..79be649 100644
--- a/src/mate-screensaver-dialog.c
+++ b/src/mate-screensaver-dialog.c
@@ -560,10 +560,6 @@ 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 daaa179..acf23ef 100644
--- a/src/mate-screensaver-gl-helper.c
+++ b/src/mate-screensaver-gl-helper.c
@@ -48,10 +48,6 @@ 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))
{