Drop support for glib < 2.36
This commit is contained in:
parent
82e1234a53
commit
495f56659d
|
@ -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
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue