diff options
Diffstat (limited to 'src/nm-config-data.c')
| -rw-r--r-- | src/nm-config-data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index c787aa98..29dafa14 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -11,7 +11,7 @@ #include "nm-config.h" #include "devices/nm-device.h" #include "nm-core-internal.h" -#include "nm-keyfile-internal.h" +#include "nm-keyfile/nm-keyfile-internal.h" /*****************************************************************************/ @@ -1024,8 +1024,8 @@ load_global_dns (GKeyFile *keyfile, gboolean internal) if (strv) { _nm_utils_strv_cleanup (strv, TRUE, TRUE, TRUE); for (i = 0, j = 0; strv[i]; i++) { - if ( nm_utils_ipaddr_valid (AF_INET, strv[i]) - || nm_utils_ipaddr_valid (AF_INET6, strv[i])) + if ( nm_utils_ipaddr_is_valid (AF_INET, strv[i]) + || nm_utils_ipaddr_is_valid (AF_INET6, strv[i])) strv[j++] = strv[i]; else g_free (strv[i]); @@ -1147,8 +1147,8 @@ global_dns_domain_from_dbus (char *name, GVariant *variant) strv = g_variant_dup_strv (val, NULL); _nm_utils_strv_cleanup (strv, TRUE, TRUE, TRUE); for (i = 0, j = 0; strv && strv[i]; i++) { - if ( nm_utils_ipaddr_valid (AF_INET, strv[i]) - || nm_utils_ipaddr_valid (AF_INET6, strv[i])) + if ( nm_utils_ipaddr_is_valid (AF_INET, strv[i]) + || nm_utils_ipaddr_is_valid (AF_INET6, strv[i])) strv[j++] = strv[i]; else g_free (strv[i]); @@ -1875,7 +1875,7 @@ nm_config_data_new_update_no_auto_default (const NMConfigData *base, static void finalize (GObject *gobject) { - NMConfigDataPrivate *priv = NM_CONFIG_DATA_GET_PRIVATE ((NMConfigData *) gobject); + NMConfigDataPrivate *priv = NM_CONFIG_DATA_GET_PRIVATE (gobject); g_free (priv->config_main_file); g_free (priv->config_description); |