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 /callouts | |
| 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 'callouts')
| -rw-r--r-- | callouts/nm-dispatcher.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 09eb0d3a36..d9fe147f4d 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -652,9 +652,7 @@ main (int argc, char **argv) g_option_context_free (opt_ctx); -#if !GLIB_CHECK_VERSION (2, 35, 0) - g_type_init (); -#endif + nm_g_type_init (); g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM)); g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT)); |