[totem-pl-parser] tests: Disable g_type_init() calls for new GLib versions



commit 3f00f0514791aac8b1a4b4f7700159405562bdb7
Author: Philip Withnall <withnall endlessm com>
Date:   Mon Dec 19 10:47:09 2016 +0000

    tests: Disable g_type_init() calls for new GLib versions
    
    GLib deprecated g_type_init() with version 2.36.0, so we no longer need
    to call it. We require version 2.31.0, so keep the call for the
    intermediate versions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776259

 plparse/tests/disc.c   |    2 ++
 plparse/tests/parser.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/plparse/tests/disc.c b/plparse/tests/disc.c
index b791aff..c35ebc1 100644
--- a/plparse/tests/disc.c
+++ b/plparse/tests/disc.c
@@ -108,7 +108,9 @@ main (int argc, char *argv[])
 
        setlocale (LC_ALL, "");
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
        g_type_init ();
+#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=";);
 
diff --git a/plparse/tests/parser.c b/plparse/tests/parser.c
index 0ce879b..62b336a 100644
--- a/plparse/tests/parser.c
+++ b/plparse/tests/parser.c
@@ -1253,7 +1253,9 @@ main (int argc, char *argv[])
 
        setlocale (LC_ALL, "");
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
        g_type_init ();
+#endif
        g_test_init (&argc, &argv, NULL);
        g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=";);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]