wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Revert "Drop support for glib < 2.36"" 

This reverts commit 13392e50c6.
This commit is contained in:
infirit 2014-12-16 13:05:53 +01:00
parent e8cbf00e56
commit 65f91807ca
7 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -290,7 +290,7 @@ esac
PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
PKG_CHECK_MODULES(PLUMA, [ PKG_CHECK_MODULES(PLUMA, [
libxml-2.0 >= 2.5.0 libxml-2.0 >= 2.5.0
glib-2.0 >= 2.32.0 glib-2.0 >= 2.36.0
$GMODULE_ADD $GMODULE_ADD
gthread-2.0 >= 2.13.0 gthread-2.0 >= 2.13.0
gio-2.0 >= 2.26.0 gio-2.0 >= 2.26.0

9
pluma/pluma.c
View File

@ -555,15 +555,6 @@ main (int argc, char *argv[])
gchar *dir; gchar *dir;
gchar *icon_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 */ /* Setup debugging */
pluma_debug_init (); pluma_debug_init ();

3
tests/document-input-stream.c
View File

@ -140,9 +140,6 @@ test_consecutive_multibyte_big_read ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/document-input-stream/empty", test_empty); g_test_add_func ("/document-input-stream/empty", test_empty);

3
tests/document-loader.c
View File

@ -238,9 +238,6 @@ test_begin_new_line_detection ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

3
tests/document-output-stream.c
View File

@ -119,9 +119,6 @@ test_big_char ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

3
tests/document-saver.c
View File

@ -687,9 +687,6 @@ int main (int argc,
gboolean have_unowned; gboolean have_unowned;
gboolean have_unowned_group; gboolean have_unowned_group;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
pluma_prefs_manager_app_init (); pluma_prefs_manager_app_init ();

3
tests/smart-converter.c
View File

@ -341,9 +341,6 @@ test_guessed ()
int main (int argc, int main (int argc,
char *argv[]) char *argv[])
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8); g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8);