colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: remove anachronistic NMAccessPoint getter pattern

Browse Source 
Just use priv.
This commit is contained in:
Dan Williams
2015-04-20 11:11:56 -05:00
parent a646514fb6
commit 2028ef2c82
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/devices/wifi/nm-wifi-ap.c
View File

@@ -218,13 +218,9 @@ nm_ap_set_address (NMAccessPoint *ap, const char *addr)
NM80211Mode NM80211Mode
nm_ap_get_mode (NMAccessPoint *ap) nm_ap_get_mode (NMAccessPoint *ap)
{ {
NM80211Mode mode; g_return_val_if_fail (NM_IS_AP (ap), NM_802_11_MODE_UNKNOWN);
g_return_val_if_fail (NM_IS_AP (ap), -1); return NM_AP_GET_PRIVATE (ap)->mode;
g_object_get (ap, NM_AP_MODE, &mode, NULL);
return mode;
} }
static void static void
@@ -255,13 +251,9 @@ nm_ap_is_hotspot (NMAccessPoint *ap)
gint8 gint8
nm_ap_get_strength (NMAccessPoint *ap) nm_ap_get_strength (NMAccessPoint *ap)
{ {
gint8 strength;
g_return_val_if_fail (NM_IS_AP (ap), 0); g_return_val_if_fail (NM_IS_AP (ap), 0);
g_object_get (ap, NM_AP_STRENGTH, &strength, NULL); return NM_AP_GET_PRIVATE (ap)->strength;
return strength;
} }
void void
@@ -282,13 +274,9 @@ nm_ap_set_strength (NMAccessPoint *ap, const gint8 strength)
guint32 guint32
nm_ap_get_freq (NMAccessPoint *ap) nm_ap_get_freq (NMAccessPoint *ap)
{ {
guint32 freq;
g_return_val_if_fail (NM_IS_AP (ap), 0); g_return_val_if_fail (NM_IS_AP (ap), 0);
g_object_get (ap, NM_AP_FREQUENCY, &freq, NULL); return NM_AP_GET_PRIVATE (ap)->freq;
return freq;
} }
void void
@@ -310,13 +298,9 @@ nm_ap_set_freq (NMAccessPoint *ap,
guint32 guint32
nm_ap_get_max_bitrate (NMAccessPoint *ap) nm_ap_get_max_bitrate (NMAccessPoint *ap)
{ {
guint32 rate;
g_return_val_if_fail (NM_IS_AP (ap), 0); g_return_val_if_fail (NM_IS_AP (ap), 0);
g_object_get (ap, NM_AP_MAX_BITRATE, &rate, NULL); return NM_AP_GET_PRIVATE (ap)->max_bitrate;
return rate;
} }
void void