diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
| commit | 33491bc4279481db8ae47213e34a6d695a0e8830 (patch) | |
| tree | 097d2b0fdff3fae6885381ae5e57a182cd8cbbba /libnm-glib/nm-access-point.c | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Imported Upstream version 0.9.10.0 upstream/0.9.10.0
Diffstat (limited to 'libnm-glib/nm-access-point.c')
| -rw-r--r-- | libnm-glib/nm-access-point.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index d13a7d3c..ca3f1bf2 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -72,16 +72,6 @@ enum { LAST_PROP }; -#define DBUS_PROP_FLAGS "Flags" -#define DBUS_PROP_WPA_FLAGS "WpaFlags" -#define DBUS_PROP_RSN_FLAGS "RsnFlags" -#define DBUS_PROP_SSID "Ssid" -#define DBUS_PROP_FREQUENCY "Frequency" -#define DBUS_PROP_HW_ADDRESS "HwAddress" -#define DBUS_PROP_MODE "Mode" -#define DBUS_PROP_MAX_BITRATE "MaxBitrate" -#define DBUS_PROP_STRENGTH "Strength" - /** * nm_access_point_new: * @connection: the #DBusGConnection @@ -194,7 +184,7 @@ nm_access_point_get_frequency (NMAccessPoint *ap) * nm_access_point_get_bssid: * @ap: a #NMAccessPoint * - * Gets the Basic Service Set ID (BSSID) of the WiFi access point. + * Gets the Basic Service Set ID (BSSID) of the Wi-Fi access point. * * Returns: the BSSID of the access point. This is an internal string and must * not be modified or freed. @@ -246,9 +236,9 @@ nm_access_point_get_mode (NMAccessPoint *ap) * nm_access_point_get_max_bitrate: * @ap: a #NMAccessPoint * - * Gets the maximum bit rate of the access point. + * Gets the maximum bit rate of the access point in kbit/s. * - * Returns: the maximum bit rate + * Returns: the maximum bit rate (kbit/s) **/ guint32 nm_access_point_get_max_bitrate (NMAccessPoint *ap) @@ -281,12 +271,12 @@ nm_access_point_get_strength (NMAccessPoint *ap) * @ap: an #NMAccessPoint to validate @connection against * @connection: an #NMConnection to validate against @ap * - * Validates a given connection against a given WiFi access point to ensure that + * Validates a given connection against a given Wi-Fi access point to ensure that * the connection may be activated with that AP. The connection must match the * @ap's SSID, (if given) BSSID, and other attributes like security settings, * channel, band, etc. * - * Returns: %TRUE if the connection may be activated with this WiFi AP, + * Returns: %TRUE if the connection may be activated with this Wi-Fi AP, * %FALSE if it cannot be. **/ gboolean @@ -539,12 +529,7 @@ constructed (GObject *object) G_OBJECT_CLASS (nm_access_point_parent_class)->constructed (object); priv = NM_ACCESS_POINT_GET_PRIVATE (object); - - priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (object)), - NM_DBUS_SERVICE, - nm_object_get_path (NM_OBJECT (object)), - NM_DBUS_INTERFACE_ACCESS_POINT); - + priv->proxy = _nm_object_new_proxy (NM_OBJECT (object), NULL, NM_DBUS_INTERFACE_ACCESS_POINT); register_properties (NM_ACCESS_POINT (object)); } @@ -675,7 +660,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class) /** * NMAccessPoint:max-bitrate: * - * The maximum bit rate of the access point. + * The maximum bit rate of the access point in kbit/s. **/ g_object_class_install_property (object_class, PROP_MAX_BITRATE, |