Re: [PATCH] supplicant: fix expected return type of AddBlob D-Bus call

On Tue, 2014-08-19 at 20:43 -0700, Geoffrey Thomas wrote:
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>

Pushed to master, 0.9.10, and 0.9.8.  Thanks!


  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 
index 0c84483..425de83 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -1182,11 +1182,10 @@ add_blob_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
      NMSupplicantInfo *info = (NMSupplicantInfo *) user_data;
      NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (info->interface);
      GError *err = NULL;
-     guint tmp;


-     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 (info->interface, err);
              g_error_free (err);

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]