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-ip4-config.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-ip4-config.c')
| -rw-r--r-- | libnm/nm-ip4-config.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c index 727e2a6b30..5635cbd9fc 100644 --- a/libnm/nm-ip4-config.c +++ b/libnm/nm-ip4-config.c @@ -177,8 +177,6 @@ get_property (GObject *object, NMIP4Config *self = NM_IP4_CONFIG (object); NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); - _nm_object_ensure_inited (NM_OBJECT (object)); - switch (prop_id) { case PROP_GATEWAY: g_value_set_string (value, nm_ip4_config_get_gateway (self)); @@ -319,7 +317,6 @@ nm_ip4_config_get_gateway (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->gateway; } @@ -337,7 +334,6 @@ nm_ip4_config_get_addresses (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->addresses; } @@ -356,7 +352,6 @@ nm_ip4_config_get_nameservers (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->nameservers; } @@ -374,7 +369,6 @@ nm_ip4_config_get_domains (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return handle_ptr_array_return (NM_IP4_CONFIG_GET_PRIVATE (config)->domains); } @@ -392,7 +386,6 @@ nm_ip4_config_get_searches (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return handle_ptr_array_return (NM_IP4_CONFIG_GET_PRIVATE (config)->searches); } @@ -411,7 +404,6 @@ nm_ip4_config_get_wins_servers (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->wins; } @@ -430,6 +422,5 @@ nm_ip4_config_get_routes (NMIP4Config *config) { g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL); - _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->routes; } |