diff options
| author | infirit <[email protected]> | 2014-05-19 12:46:54 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-19 12:46:54 +0200 |
| commit | 495f56659d607938db00e34c9f84bac24013d999 (patch) | |
| tree | e9a2bb3cdc860bb64911346602e0cba06034ea0e | |
| parent | 82e1234a535c5e719d8876845e82e919c3662243 (diff) | |
| download | pluma-495f56659d607938db00e34c9f84bac24013d999.tar.bz2 pluma-495f56659d607938db00e34c9f84bac24013d999.tar.xz | |
Drop support for glib < 2.36
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pluma/pluma.c | 9 | ||||
| -rw-r--r-- | tests/document-input-stream.c | 3 | ||||
| -rw-r--r-- | tests/document-loader.c | 3 | ||||
| -rw-r--r-- | tests/document-output-stream.c | 3 | ||||
| -rw-r--r-- | tests/document-saver.c | 3 | ||||
| -rw-r--r-- | tests/smart-converter.c | 3 |
7 files changed, 1 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 5bddc1c3..82519b6d 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); |