From fe5d59bc8787a944ea230568bb2fae56b6450554 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 18 Feb 2011 12:01:46 -0600 Subject: [PATCH] libnm-glib: nm_device_wifi_get_capabilities() should return NMDeviceWifiCapabilities --- libnm-glib/nm-device-wifi.c | 4 ++-- libnm-glib/nm-device-wifi.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 530fa441af..0341983f1d 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -50,7 +50,7 @@ typedef struct { guint32 rate; NMAccessPoint *active_ap; gboolean null_active_ap; - guint32 wireless_caps; + NMDeviceWifiCapabilities wireless_caps; GPtrArray *aps; gboolean wireless_enabled; @@ -233,7 +233,7 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device) * * Returns: the capabilities **/ -guint32 +NMDeviceWifiCapabilities nm_device_wifi_get_capabilities (NMDeviceWifi *device) { NMDeviceWifiPrivate *priv; diff --git a/libnm-glib/nm-device-wifi.h b/libnm-glib/nm-device-wifi.h index 21f3558af3..fb2ab27da9 100644 --- a/libnm-glib/nm-device-wifi.h +++ b/libnm-glib/nm-device-wifi.h @@ -67,17 +67,17 @@ GType nm_device_wifi_get_type (void); GObject *nm_device_wifi_new (DBusGConnection *connection, const char *path); -const char * nm_device_wifi_get_hw_address (NMDeviceWifi *device); -const char * nm_device_wifi_get_permanent_hw_address (NMDeviceWifi *device); -NM80211Mode nm_device_wifi_get_mode (NMDeviceWifi *device); -guint32 nm_device_wifi_get_bitrate (NMDeviceWifi *device); -guint32 nm_device_wifi_get_capabilities (NMDeviceWifi *device); -NMAccessPoint * nm_device_wifi_get_active_access_point (NMDeviceWifi *device); +const char * nm_device_wifi_get_hw_address (NMDeviceWifi *device); +const char * nm_device_wifi_get_permanent_hw_address (NMDeviceWifi *device); +NM80211Mode nm_device_wifi_get_mode (NMDeviceWifi *device); +guint32 nm_device_wifi_get_bitrate (NMDeviceWifi *device); +NMDeviceWifiCapabilities nm_device_wifi_get_capabilities (NMDeviceWifi *device); +NMAccessPoint * nm_device_wifi_get_active_access_point (NMDeviceWifi *device); -NMAccessPoint * nm_device_wifi_get_access_point_by_path (NMDeviceWifi *device, - const char *path); +NMAccessPoint * nm_device_wifi_get_access_point_by_path (NMDeviceWifi *device, + const char *path); -const GPtrArray *nm_device_wifi_get_access_points (NMDeviceWifi *device); +const GPtrArray * nm_device_wifi_get_access_points (NMDeviceWifi *device); G_END_DECLS