diff options
Diffstat (limited to 'src/supplicant/nm-supplicant-interface.c')
| -rw-r--r-- | src/supplicant/nm-supplicant-interface.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 71f1f9aa..ab8a0670 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -228,15 +228,17 @@ bss_proxy_acquired_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_da GVariant *props = NULL; const char *object_path; BssData *bss_data; + gboolean success; - g_async_initable_init_finish (G_ASYNC_INITABLE (proxy), result, &error); - if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + success = g_async_initable_init_finish (G_ASYNC_INITABLE (proxy), result, &error); + if ( !success + && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; self = NM_SUPPLICANT_INTERFACE (user_data); priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); - if (error) { + if (!success) { _LOGD ("failed to acquire BSS proxy: (%s)", error->message); g_hash_table_remove (priv->bss_proxies, g_dbus_proxy_get_object_path (proxy)); @@ -1120,7 +1122,7 @@ nm_supplicant_interface_disconnect (NMSupplicantInterface * self) /* Cancel all pending calls related to a prior connection attempt */ if (priv->assoc_data) { - gs_free GError *error = NULL; + gs_free_error GError *error = NULL; nm_utils_error_set_cancelled (&error, FALSE, "NMSupplicantInterface"); assoc_return (self, error, "abort due to disconnect"); @@ -1597,7 +1599,7 @@ dispose (GObject *object) NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); if (priv->assoc_data) { - gs_free GError *error = NULL; + gs_free_error GError *error = NULL; nm_utils_error_set_cancelled (&error, TRUE, "NMSupplicantInterface"); assoc_return (self, error, "cancelled due to dispose of supplicant interface"); |