From 258e74eb0c191cdd86719ad65864ab3c27ada80c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 15 May 2014 14:25:07 -0400 Subject: 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**. --- libnm/nm-device-wifi.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'libnm/nm-device-wifi.c') diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 5a10553428..7abab9aa61 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -116,7 +116,6 @@ nm_device_wifi_get_hw_address (NMDeviceWifi *device) { g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->hw_address; } @@ -134,7 +133,6 @@ nm_device_wifi_get_permanent_hw_address (NMDeviceWifi *device) { g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->perm_hw_address; } @@ -151,7 +149,6 @@ nm_device_wifi_get_mode (NMDeviceWifi *device) { g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), 0); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->mode; } @@ -182,7 +179,6 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device) return 0; } - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->rate; } @@ -199,7 +195,6 @@ nm_device_wifi_get_capabilities (NMDeviceWifi *device) { g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), 0); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->wireless_caps; } @@ -234,7 +229,6 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *device) break; } - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_WIFI_GET_PRIVATE (device)->active_ap; } @@ -253,7 +247,6 @@ nm_device_wifi_get_access_points (NMDeviceWifi *device) { g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL); - _nm_object_ensure_inited (NM_OBJECT (device)); return handle_ptr_array_return (NM_DEVICE_WIFI_GET_PRIVATE (device)->aps); } @@ -528,8 +521,6 @@ get_property (GObject *object, { NMDeviceWifi *self = NM_DEVICE_WIFI (object); - _nm_object_ensure_inited (NM_OBJECT (object)); - switch (prop_id) { case PROP_HW_ADDRESS: g_value_set_string (value, nm_device_wifi_get_hw_address (self)); -- cgit v1.2.1