diff options
author | Thomas Haller <thaller@redhat.com> | 2014-07-10 10:41:31 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-07-12 13:56:52 +0200 |
commit | 904e9614641fe8203a5f61abaa841b7d186a343b (patch) | |
tree | 110e2f0004e15246e38eae7c6bff0f7fca731141 /clients/nm-online.c | |
parent | 3a338521703dc8be1e0589684c734f870e2c0633 (diff) | |
download | NetworkManager-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 'clients/nm-online.c')
-rw-r--r-- | clients/nm-online.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clients/nm-online.c b/clients/nm-online.c index bb0c970663..cd97e6cc16 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -41,6 +41,7 @@ #include <glib/gi18n.h> #include <NetworkManager.h> +#include "nm-glib-compat.h" #define PROGRESS_STEPS 15 #define WAIT_STARTUP_TAG "wait-startup" @@ -188,9 +189,7 @@ main (int argc, char *argv[]) } remaining_ms = t_secs * 1000; -#if !GLIB_CHECK_VERSION (2, 35, 0) - g_type_init (); -#endif + nm_g_type_init (); client = nm_client_new (NULL, &error); if (!client) { |