From 65f91807ca3f5e1d78cc69f004bfd036f7382b8f Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 16 Dec 2014 13:05:53 +0100
Subject: Revert "Revert "Drop support for glib < 2.36""

This reverts commit 13392e50c61ce3f3d7d04b59677380f935cf3d3c.
---
 configure.ac                   | 2 +-
 pluma/pluma.c                  | 9 ---------
 tests/document-input-stream.c  | 3 ---
 tests/document-loader.c        | 3 ---
 tests/document-output-stream.c | 3 ---
 tests/document-saver.c         | 3 ---
 tests/smart-converter.c        | 3 ---
 7 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7cb1ad4a..d7bfd702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,7 +290,7 @@ esac
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
 PKG_CHECK_MODULES(PLUMA, [
 	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.32.0
+	glib-2.0 >= 2.36.0
 	$GMODULE_ADD
 	gthread-2.0 >= 2.13.0
 	gio-2.0 >= 2.26.0
diff --git a/pluma/pluma.c b/pluma/pluma.c
index 9166a749..9e52bb90 100644
--- a/pluma/pluma.c
+++ b/pluma/pluma.c
@@ -555,15 +555,6 @@ main (int argc, char *argv[])
 	gchar *dir;
 	gchar *icon_dir;
 
-	/* Init type system as soon as possible */
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
-
-	/* Init glib threads asap */
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-	g_thread_init (NULL);
-#endif
 
 	/* Setup debugging */
 	pluma_debug_init ();
diff --git a/tests/document-input-stream.c b/tests/document-input-stream.c
index 930912e6..2da42d9b 100644
--- a/tests/document-input-stream.c
+++ b/tests/document-input-stream.c
@@ -140,9 +140,6 @@ test_consecutive_multibyte_big_read ()
 int main (int   argc,
           char *argv[])
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
 	g_test_init (&argc, &argv, NULL);
 
 	g_test_add_func ("/document-input-stream/empty", test_empty);
diff --git a/tests/document-loader.c b/tests/document-loader.c
index a3e6a57b..25721bac 100644
--- a/tests/document-loader.c
+++ b/tests/document-loader.c
@@ -238,9 +238,6 @@ test_begin_new_line_detection ()
 int main (int   argc,
           char *argv[])
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
 	g_test_init (&argc, &argv, NULL);
 
 	pluma_prefs_manager_app_init ();
diff --git a/tests/document-output-stream.c b/tests/document-output-stream.c
index b6a474e2..8c9f6de4 100644
--- a/tests/document-output-stream.c
+++ b/tests/document-output-stream.c
@@ -119,9 +119,6 @@ test_big_char ()
 int main (int   argc,
           char *argv[])
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
 	g_test_init (&argc, &argv, NULL);
 
 	pluma_prefs_manager_app_init ();
diff --git a/tests/document-saver.c b/tests/document-saver.c
index 707e0984..455ef656 100644
--- a/tests/document-saver.c
+++ b/tests/document-saver.c
@@ -687,9 +687,6 @@ int main (int   argc,
 	gboolean have_unowned;
 	gboolean have_unowned_group;
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
 	g_test_init (&argc, &argv, NULL);
 
 	pluma_prefs_manager_app_init ();
diff --git a/tests/smart-converter.c b/tests/smart-converter.c
index 4f22c68c..58403abf 100644
--- a/tests/smart-converter.c
+++ b/tests/smart-converter.c
@@ -341,9 +341,6 @@ test_guessed ()
 int main (int   argc,
           char *argv[])
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init ();
-#endif
 	g_test_init (&argc, &argv, NULL);
 
 	g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8);
-- 
cgit v1.2.1