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-modem.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-modem.c')
| -rw-r--r-- | libnm/nm-device-modem.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index 400ef58cf6..511f084bba 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -82,7 +82,6 @@ nm_device_modem_get_modem_capabilities (NMDeviceModem *self) { g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NM_DEVICE_MODEM_CAPABILITY_NONE); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_MODEM_GET_PRIVATE (self)->caps; } @@ -102,7 +101,6 @@ nm_device_modem_get_current_capabilities (NMDeviceModem *self) { g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NM_DEVICE_MODEM_CAPABILITY_NONE); - _nm_object_ensure_inited (NM_OBJECT (self)); return NM_DEVICE_MODEM_GET_PRIVATE (self)->current_caps; } @@ -211,8 +209,6 @@ get_property (GObject *object, { NMDeviceModem *self = NM_DEVICE_MODEM (object); - _nm_object_ensure_inited (NM_OBJECT (object)); - switch (prop_id) { case PROP_MODEM_CAPS: g_value_set_uint (value, nm_device_modem_get_modem_capabilities (self)); |