diff options
| author | Geoffrey Thomas <gthomas@mokafive.com> | 2014-08-19 20:43:40 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-08-20 09:32:12 -0500 |
| commit | c75d878aa2b34be1b97191952c4687558c3515f9 (patch) | |
| tree | d55300bd92038d59faf1430ae63ff7db5b67435a /src/supplicant-manager/nm-supplicant-interface.c | |
| parent | 00af27f0ba3fb8dcd58bc73934e98c44cd3f43b9 (diff) | |
| download | NetworkManager-c75d878aa2b34be1b97191952c4687558c3515f9.tar.gz | |
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 <gthomas@mokafive.com>
Diffstat (limited to 'src/supplicant-manager/nm-supplicant-interface.c')
| -rw-r--r-- | src/supplicant-manager/nm-supplicant-interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 2df5d8d3b3..77924b3e7a 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); |