summaryrefslogtreecommitdiff
path: root/tests/testing-util
diff options
context:
space:
mode:
authorGarrett Regier <garrettregier@gmail.com>2012-11-04 07:38:46 -0800
committerGarrett Regier <garrettregier@gmail.com>2013-02-14 03:45:05 -0800
commit9539be96f9b0df1e0afe8191945585334dc53631 (patch)
treed0f2e7b4492335dabc37642019e378d79493a193 /tests/testing-util
parentc6db987fbfca725fac644f56a5634070a265811b (diff)
downloadlibpeas-9539be96f9b0df1e0afe8191945585334dc53631.tar.gz
Remove g_type_init() calls
But call it in testing_util_init() if GLib < 2.35.0.
Diffstat (limited to 'tests/testing-util')
-rw-r--r--tests/testing-util/testing-util.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/testing-util/testing-util.c b/tests/testing-util/testing-util.c
index 8813dff..a97bcbd 100644
--- a/tests/testing-util/testing-util.c
+++ b/tests/testing-util/testing-util.c
@@ -124,6 +124,10 @@ testing_util_init (void)
if (initialized)
return;
+#if !GLIB_CHECK_VERSION (2, 35, 0)
+ g_type_init ();
+#endif
+
/* Don't abort on warnings or criticals */
g_log_set_always_fatal (G_LOG_LEVEL_ERROR);