From 1d2835b99299fcc4e850c6390d1a480c549ecb3e Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Tue, 19 Aug 2014 20:43:40 -0700 Subject: [PATCH] supplicant: fix expected return type of AddBlob D-Bus call Commit fb6cde50 changed from setBlobs in the old wpa_supplicant D-Bus interface, which returned an integer status code, to AddBlob in the new one, which doesn't, but didn't account for that change. That caused error messages of the form "Couldn't set network certificates: Too few arguments in reply." on valid connection requests. Signed-off-by: Geoffrey Thomas --- src/supplicant-manager/nm-supplicant-interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 2bfc400b49..e087729269 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -1033,12 +1033,11 @@ add_blob_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) NMSupplicantInterface *self = NM_SUPPLICANT_INTERFACE (user_data); NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); GError *err = NULL; - guint tmp; priv->blobs_left--; nm_call_store_remove (priv->assoc_pcalls, proxy, call_id); - if (!dbus_g_proxy_end_call (proxy, call_id, &err, G_TYPE_UINT, &tmp, G_TYPE_INVALID)) { + if (!dbus_g_proxy_end_call (proxy, call_id, &err, G_TYPE_INVALID)) { nm_log_warn (LOGD_SUPPLICANT, "Couldn't set network certificates: %s.", err->message); emit_error_helper (self, err); g_error_free (err);