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-vlan.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-vlan.c')
| -rw-r--r-- | libnm/nm-device-vlan.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index 8dd38dbdbe..985d8b599f 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -84,7 +84,6 @@ nm_device_vlan_get_hw_address (NMDeviceVlan *device) { g_return_val_if_fail (NM_IS_DEVICE_VLAN (device), NULL); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_VLAN_GET_PRIVATE (device)->hw_address; } @@ -101,7 +100,6 @@ nm_device_vlan_get_carrier (NMDeviceVlan *device) { g_return_val_if_fail (NM_IS_DEVICE_VLAN (device), FALSE); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_VLAN_GET_PRIVATE (device)->carrier; } @@ -116,7 +114,6 @@ nm_device_vlan_get_vlan_id (NMDeviceVlan *device) { g_return_val_if_fail (NM_IS_DEVICE_VLAN (device), FALSE); - _nm_object_ensure_inited (NM_OBJECT (device)); return NM_DEVICE_VLAN_GET_PRIVATE (device)->vlan_id; } @@ -245,8 +242,6 @@ get_property (GObject *object, { NMDeviceVlan *device = NM_DEVICE_VLAN (object); - _nm_object_ensure_inited (NM_OBJECT (object)); - switch (prop_id) { case PROP_HW_ADDRESS: g_value_set_string (value, nm_device_vlan_get_hw_address (device)); |