diff options
Diffstat (limited to 'libnm-glib/libnm_glib.c')
| -rw-r--r-- | libnm-glib/libnm_glib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 1d755786..a2a6d26e 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -456,8 +456,7 @@ _libnm_glib_ctx_free (libnm_glib_ctx *ctx) if (ctx->callbacks_lock) g_mutex_free (ctx->callbacks_lock); - g_slist_foreach (ctx->callbacks, (GFunc)g_free, NULL); - g_slist_free (ctx->callbacks); + g_slist_free_full (ctx->callbacks, g_free); if (ctx->thread) g_thread_join (ctx->thread); @@ -494,7 +493,10 @@ libnm_glib_init (void) { libnm_glib_ctx *ctx = NULL; +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif + if (!g_thread_supported ()) g_thread_init (NULL); dbus_g_thread_init (); |