From 37a5bfcbeb18a526eabff62c593acc6c96bc06e7 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 6 Apr 2015 16:09:18 -0400 Subject: [PATCH] supplicant-manager, wifi: (trivial) fix signal argument types A few places in the NMSupplicantInterface API and in NMDeviceWifi's use of it were still using "GHashTable *properties" where they should have been using "GVariant *properties". (This didn't cause any actual problems because nothing was looking at those arguments.) (Also fix a comment typo.) --- src/devices/wifi/nm-device-wifi.c | 6 +++--- src/supplicant-manager/nm-supplicant-interface.c | 2 +- src/supplicant-manager/nm-supplicant-interface.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index e3d26a6d48..9c417f45b4 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -170,7 +170,7 @@ static void supplicant_iface_new_bss_cb (NMSupplicantInterface * iface, static void supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface, const char *object_path, - GHashTable *properties, + GVariant *properties, NMDeviceWifi *self); static void supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface, @@ -1865,7 +1865,7 @@ supplicant_iface_new_bss_cb (NMSupplicantInterface *iface, static void supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface, const char *object_path, - GHashTable *properties, + GVariant *properties, NMDeviceWifi *self) { NMDeviceState state; @@ -1875,7 +1875,7 @@ supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface, g_return_if_fail (object_path != NULL); g_return_if_fail (properties != NULL); - /* Ignore new APs when unavailable or unamnaged */ + /* Ignore new APs when unavailable or unmanaged */ state = nm_device_get_state (NM_DEVICE (self)); if (state <= NM_DEVICE_STATE_UNAVAILABLE) return; diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index a190afb452..7f79964410 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -1371,7 +1371,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NMSupplicantInterfaceClass, bss_updated), NULL, NULL, NULL, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VARIANT); signals[BSS_REMOVED] = g_signal_new (NM_SUPPLICANT_INTERFACE_BSS_REMOVED, diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h index 1b1139d404..da3ad57048 100644 --- a/src/supplicant-manager/nm-supplicant-interface.h +++ b/src/supplicant-manager/nm-supplicant-interface.h @@ -90,12 +90,12 @@ typedef struct { /* interface saw a new BSS */ void (*new_bss) (NMSupplicantInterface *iface, const char *object_path, - GHashTable *props); + GVariant *props); /* a BSS property changed */ void (*bss_updated) (NMSupplicantInterface *iface, const char *object_path, - GHashTable *props); + GVariant *props); /* supplicant removed a BSS from its scan list */ void (*bss_removed) (NMSupplicantInterface *iface,