From 365d495c81d21dce4ed8e494f9bb0dc2476d4535 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 17 Dec 2014 11:52:41 +0100 Subject: Revert "We agreed to target Glib 2.32" This reverts commit 18e079201d970b6402b56ef0c0b2a01496ff582e. --- README | 2 +- configure.ac | 2 +- src/gpm-backlight-helper.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README b/README index 5087b37..e61a4a8 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ MATE Power Manager comes in three main parts: To build, MATE Power Manager requires - - Glib (2.32.0 or later) + - Glib (2.36.0 or later) - Gtk2+ (2.24.0 or later) - GNOME Keyring (3.0.0 or later) - DBus (0.70 or later) diff --git a/configure.ac b/configure.ac index 97ad20f..ae905b1 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ GLIB_GSETTINGS dnl ---------------------------------------------------------------------------- dnl - Library dependencies dnl ---------------------------------------------------------------------------- -GLIB_REQUIRED=2.32.0 +GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.36.0 GDK_REQUIRED=2.11.0 GNOME_KEYRING_REQUIRED=3.0.0 diff --git a/src/gpm-backlight-helper.c b/src/gpm-backlight-helper.c index 07ad25f..4350f16 100644 --- a/src/gpm-backlight-helper.c +++ b/src/gpm-backlight-helper.c @@ -178,11 +178,6 @@ main (gint argc, gchar *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#if !GLIB_CHECK_VERSION(2,36,0) - /* setup type system */ - g_type_init (); -#endif - context = g_option_context_new (NULL); /* TRANSLATORS: tool that is used when copying profiles system-wide */ g_option_context_set_summary (context, _("MATE Power Manager Backlight Helper")); -- cgit v1.2.1