summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 13:11:43 +0100
committerinfirit <[email protected]>2014-12-16 13:11:43 +0100
commit17dccaa7c69f0ab8e278699a5d138662ce8126b5 (patch)
treee84c9075d1aa5577d34fd3c6c5fb378940fdd89b
parent5ee2c81ca6d335b18d51dbc6f1036c5f08396220 (diff)
downloadmate-control-center-17dccaa7c69f0ab8e278699a5d138662ce8126b5.tar.bz2
mate-control-center-17dccaa7c69f0ab8e278699a5d138662ce8126b5.tar.xz
Revert "Add back support for Glib 2.32"
This reverts commit 5ee2c81ca6d335b18d51dbc6f1036c5f08396220.
-rw-r--r--configure.ac2
-rw-r--r--font-viewer/font-thumbnailer.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 419c996f..0e129039 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ dnl ==============================================
PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl
$GMODULE_ADD dnl
- glib-2.0 >= 2.32 dnl
+ glib-2.0 >= 2.36 dnl
gthread-2.0 dnl
gio-2.0 dnl
gio-unix-2.0 dnl
diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c
index 9b9c833a..921d2679 100644
--- a/font-viewer/font-thumbnailer.c
+++ b/font-viewer/font-thumbnailer.c
@@ -256,10 +256,6 @@ main(int argc, char **argv)
setlocale (LC_ALL, "");
-#if !GLIB_CHECK_VERSION (2, 36, 0)
- g_type_init ();
-#endif
-
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);