diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /src/nm-auth-manager.c | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'src/nm-auth-manager.c')
| -rw-r--r-- | src/nm-auth-manager.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 4359d8f1..003d9975 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -79,7 +79,7 @@ NM_DEFINE_SINGLETON_REGISTER (NMAuthManager); \ if ((self) != singleton_instance) \ g_snprintf (__prefix, sizeof (__prefix), ""_NMLOG_PREFIX_NAME"[%p]", (self)); \ - _nm_log ((level), (_NMLOG_DOMAIN), 0, \ + _nm_log ((level), (_NMLOG_DOMAIN), 0, NULL, NULL, \ "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ __prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } \ @@ -595,10 +595,7 @@ dispose (GObject *object) /* since we take a reference for each queued call, we don't expect to have any queued calls in dispose() */ g_assert (!priv->queued_calls); - if (priv->new_proxy_cancellable) { - g_cancellable_cancel (priv->new_proxy_cancellable); - g_clear_object (&priv->new_proxy_cancellable); - } + nm_clear_g_cancellable (&priv->new_proxy_cancellable); if (priv->proxy) { g_signal_handlers_disconnect_by_data (priv->proxy, self); |