diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-16 16:42:46 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
| commit | 21c8a6b20effbe1e689505a0cbb23594be06068c (patch) | |
| tree | 15e43867853d0242950e40e049499e1c2d29cc78 /libnm/nm-ip4-config.c | |
| parent | 303e84e65e5b9b5a403e4f8366e094447d51a9fa (diff) | |
| download | NetworkManager-21c8a6b20effbe1e689505a0cbb23594be06068c.tar.gz | |
libnm-core, all: merge IPv4 and IPv6 address/route types
Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route
and NMIP6Route into NMIPRoute. The new types represent IP addresses as
strings, rather than in binary, and so are address-family agnostic.
Diffstat (limited to 'libnm/nm-ip4-config.c')
| -rw-r--r-- | libnm/nm-ip4-config.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c index ac3e5b36e9..bc86821043 100644 --- a/libnm/nm-ip4-config.c +++ b/libnm/nm-ip4-config.c @@ -161,13 +161,13 @@ get_property (GObject *object, break; case PROP_ADDRESSES: g_value_take_boxed (value, _nm_utils_copy_array (nm_ip4_config_get_addresses (self), - (NMUtilsCopyFunc) nm_ip4_address_dup, - (GDestroyNotify) nm_ip4_address_unref)); + (NMUtilsCopyFunc) nm_ip_address_dup, + (GDestroyNotify) nm_ip_address_unref)); break; case PROP_ROUTES: g_value_take_boxed (value, _nm_utils_copy_array (nm_ip4_config_get_routes (self), - (NMUtilsCopyFunc) nm_ip4_route_dup, - (GDestroyNotify) nm_ip4_route_unref)); + (NMUtilsCopyFunc) nm_ip_route_dup, + (GDestroyNotify) nm_ip_route_unref)); break; case PROP_NAMESERVERS: g_value_set_boxed (value, (char **) nm_ip4_config_get_nameservers (self)); @@ -220,7 +220,7 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) /** * NMIP4Config:addresses: * - * A #GPtrArray containing the addresses (#NMIP4Address) of the configuration. + * A #GPtrArray containing the addresses (#NMIPAddress) of the configuration. **/ g_object_class_install_property (object_class, PROP_ADDRESSES, @@ -232,7 +232,7 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) /** * NMIP4Config:routes: * - * A #GPtrArray containing the routes (#NMIP4Route) of the configuration. + * A #GPtrArray containing the routes (#NMIPRoute) of the configuration. **/ g_object_class_install_property (object_class, PROP_ROUTES, @@ -312,8 +312,8 @@ nm_ip4_config_get_gateway (NMIP4Config *config) * * Gets the IP4 addresses (containing the address, prefix, and gateway). * - * Returns: (element-type NMIP4Address) (transfer none): the #GPtrArray - * containing #NMIP4Address<!-- -->es. This is the internal copy used by the + * Returns: (element-type NMIPAddress) (transfer none): the #GPtrArray + * containing #NMIPAddress<!-- -->es. This is the internal copy used by the * configuration and must not be modified. **/ GPtrArray * @@ -398,8 +398,8 @@ nm_ip4_config_get_wins_servers (NMIP4Config *config) * * Gets the routes. * - * Returns: (element-type NMIP4Route) (transfer none): the #GPtrArray containing - * #NMIP4Routes. This is the internal copy used by the configuration, and must + * Returns: (element-type NMIPRoute) (transfer none): the #GPtrArray containing + * #NMIPRoutes. This is the internal copy used by the configuration, and must * not be modified. **/ GPtrArray * |