Re: [PATCH] supplicant-manager: fix DBus signal signatures



On Fri, 2011-07-29 at 08:39 -0400, Daniel Gnoutcheff wrote:
> The DBus signatures registered (via dbus_g_proxy_add_signal) for the
> fi.w1.wpa_supplicant.Interface.{BSSAdded,ScanDone} signals were
> incorrect.  That prevented us from receiving wifi ap scan results, at
> least in the case where wpa_supplicant has DBus introspection disabled.

Pushed, thanks!
Dan

> ---
>  src/supplicant-manager/nm-supplicant-interface.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
> index 0294195..857cde5 100644
> --- a/src/supplicant-manager/nm-supplicant-interface.c
> +++ b/src/supplicant-manager/nm-supplicant-interface.c
> @@ -467,7 +467,8 @@ interface_add_done (NMSupplicantInterface *self, char *path)
>  	                             G_CALLBACK (wpas_iface_properties_changed),
>  	                             self, NULL);
>  
> -	dbus_g_proxy_add_signal (priv->iface_proxy, "ScanDone", G_TYPE_INVALID);
> +	dbus_g_proxy_add_signal (priv->iface_proxy, "ScanDone",
> +	                         G_TYPE_BOOLEAN, G_TYPE_INVALID);
>  	dbus_g_proxy_connect_signal (priv->iface_proxy, "ScanDone",
>  	                             G_CALLBACK (wpas_iface_scan_done),
>  	                             self,
> @@ -475,9 +476,11 @@ interface_add_done (NMSupplicantInterface *self, char *path)
>  
>  	dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED,
>  	                                   G_TYPE_NONE,
> -	                                   G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT,
> +	                                   DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT,
>  	                                   G_TYPE_INVALID);
> -	dbus_g_proxy_add_signal (priv->iface_proxy, "BSSAdded", G_TYPE_INVALID);
> +	dbus_g_proxy_add_signal (priv->iface_proxy, "BSSAdded", 
> +	                         DBUS_TYPE_G_OBJECT_PATH, DBUS_TYPE_G_MAP_OF_VARIANT,
> +	                         G_TYPE_INVALID);
>  	dbus_g_proxy_connect_signal (priv->iface_proxy, "BSSAdded",
>  	                             G_CALLBACK (wpas_iface_bss_added),
>  	                             self,




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