diff options
author | Dan Winship <danw@gnome.org> | 2014-05-15 14:25:07 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:40 -0400 |
commit | 258e74eb0c191cdd86719ad65864ab3c27ada80c (patch) | |
tree | 29d5a0d72ca94d1ea7daaa6c19ef745db31806fd /libnm/nm-device-wimax.c | |
parent | 8ca2998d81ca7534c59262b10f5bf3c480177b88 (diff) | |
download | NetworkManager-258e74eb0c191cdd86719ad65864ab3c27ada80c.tar.gz |
libnm: make the the use of GInitable mandatory
Remove _nm_object_ensure_inited(), etc; objects that implement
GInitable are now mandatory-to-init().
Remove constructor() implementations that sometimes return NULL; do
all the relevant checking in init() instead.
Make nm_client_new() and nm_remote_settings_new() take a GCancellable
and a GError**.
Diffstat (limited to 'libnm/nm-device-wimax.c')
-rw-r--r-- | libnm/nm-device-wimax.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index a63ce1bf89..1459365f7c 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -109,7 +109,6 @@ nm_device_wimax_get_hw_address (NMDeviceWimax *wimax) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (wimax), NULL); - _nm_object_ensure_inited (NM_OBJECT (wimax)); return NM_DEVICE_WIMAX_GET_PRIVATE (wimax)->hw_address; } @@ -144,7 +143,6 @@ nm_device_wimax_get_active_nsp (NMDeviceWimax *wimax) break; } - _nm_object_ensure_inited (NM_OBJECT (wimax)); return NM_DEVICE_WIMAX_GET_PRIVATE (wimax)->active_nsp; } @@ -163,7 +161,6 @@ nm_device_wimax_get_nsps (NMDeviceWimax *wimax) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (wimax), NULL); - _nm_object_ensure_inited (NM_OBJECT (wimax)); return handle_ptr_array_return (NM_DEVICE_WIMAX_GET_PRIVATE (wimax)->nsps); } @@ -245,7 +242,6 @@ nm_device_wimax_get_center_frequency (NMDeviceWimax *self) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_WIMAX_GET_PRIVATE (self)->center_freq; } @@ -265,7 +261,6 @@ nm_device_wimax_get_rssi (NMDeviceWimax *self) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_WIMAX_GET_PRIVATE (self)->rssi; } @@ -284,7 +279,6 @@ nm_device_wimax_get_cinr (NMDeviceWimax *self) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_WIMAX_GET_PRIVATE (self)->cinr; } @@ -303,7 +297,6 @@ nm_device_wimax_get_tx_power (NMDeviceWimax *self) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_WIMAX_GET_PRIVATE (self)->tx_power; } @@ -320,7 +313,6 @@ nm_device_wimax_get_bsid (NMDeviceWimax *self) { g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), NULL); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_WIMAX_GET_PRIVATE (self)->bsid; } @@ -404,8 +396,6 @@ get_property (GObject *object, { NMDeviceWimax *self = NM_DEVICE_WIMAX (object); - _nm_object_ensure_inited (NM_OBJECT (object)); - switch (prop_id) { case PROP_HW_ADDRESS: g_value_set_string (value, nm_device_wimax_get_hw_address (self)); |