summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-07-10 10:41:31 +0200
committerThomas Haller <thaller@redhat.com>2015-07-12 13:56:52 +0200
commit904e9614641fe8203a5f61abaa841b7d186a343b (patch)
tree110e2f0004e15246e38eae7c6bff0f7fca731141 /include
parent3a338521703dc8be1e0589684c734f870e2c0633 (diff)
downloadNetworkManager-904e9614641fe8203a5f61abaa841b7d186a343b.tar.gz
all: remove #if GLIB_CHECK_VERSION conditionals around g_type_init()
g_type_init() is now provided by nm-glib-compat.h as nm_g_type_init().
Diffstat (limited to 'include')
-rw-r--r--include/nm-test-utils.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 144ebfc121..14d4bb4514 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -302,9 +302,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
__nmtst_internal.assert_logging = !!assert_logging;
-#if !GLIB_CHECK_VERSION (2, 35, 0)
- g_type_init ();
-#endif
+ nm_g_type_init ();
is_debug = g_test_verbose ();