all: use nm_utils_ipaddr_is_valid() instead of nm_utils_ipaddr_valid()

We should use the same "is-valid" function everywhere.

Since nm_utils_ipaddr_valid() is part of libnm, it does not qualify.

Use nm_utils_ipaddr_is_valid() instead.

2 files changed, 5 insertions, 5 deletions

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index c5b8bb3166..d7423b6392 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -364,7 +364,7 @@ _parse_ip_route (int family,
 	for (i = 1; routev[i]; i++) {
 		gint64 tmp64;
 
-		if (nm_utils_ipaddr_valid (family, routev[i])) {
+		if (nm_utils_ipaddr_is_valid (family, routev[i])) {
 			if (metric != -1 || attrs) {
 				g_set_error (error, 1, 0, _("the next hop ('%s') must be first"), routev[i]);
 				return NULL;
@@ -3336,7 +3336,7 @@ _set_fcn_ip_config_gateway (ARGS_SET_FCN)
 
 	value = nm_strstrip_avoid_copy_a (300, value, &value_to_free);
 
-	if (!nm_utils_ipaddr_valid (addr_family, value)) {
+	if (!nm_utils_ipaddr_is_valid (addr_family, value)) {
 		g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
 		             _("invalid gateway address '%s'"),
 		             value);
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 8e6c9600d7..c5606f11ef 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -192,7 +192,7 @@ ip_addresses_check_and_copy (GBinding     *binding,
 	strings = g_value_get_boxed (source_value);
 
 	for (i = 0; strings[i]; i++) {
-		if (!nm_utils_ipaddr_valid (addr_family, strings[i]))
+		if (!nm_utils_ipaddr_is_valid (addr_family, strings[i]))
 			return FALSE;
 	}
 
@@ -251,7 +251,7 @@ ip_gateway_from_string (GBinding     *binding,
 	const char *gateway;
 
 	gateway = g_value_get_string (source_value);
-	if (gateway && !nm_utils_ipaddr_valid (addr_family, gateway))
+	if (gateway && !nm_utils_ipaddr_is_valid (addr_family, gateway))
 		gateway = NULL;
 
 	g_value_set_string (target_value, gateway);
@@ -457,7 +457,7 @@ ip_route_transform_from_next_hop_string (GBinding     *binding,
 
 	text = g_value_get_string (source_value);
 	if (*text) {
-		if (!nm_utils_ipaddr_valid (addr_family, text))
+		if (!nm_utils_ipaddr_is_valid (addr_family, text))
 			return FALSE;
 	} else
 		text = NULL;