From 967d5d4059f6e504df47f78ca90f833d32b52ce9 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 28 Nov 2017 15:34:30 +0100 Subject: [PATCH] clients: fix display value for dns-options We must show the default value "(default)" when the list of dns-options is initialized but empty. (cherry picked from commit ca06f823713e11eb8e367709cb282e5e1fb0cc74) --- clients/common/nm-meta-setting-desc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 77e835c51e..c6c018b2ec 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3467,6 +3467,13 @@ DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options, nm_setting_ip_config_remove_dns_option, _validate_and_remove_ipv6_dns_option) +static gboolean +_dns_options_is_default (NMSettingIPConfig *setting) +{ + return nm_setting_ip_config_has_dns_options (setting) + && !nm_setting_ip_config_get_num_dns_options (setting); +} + static gboolean _set_fcn_ip6_config_addresses (ARGS_SET_FCN) { @@ -5313,7 +5320,7 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { .remove_fcn = _remove_fcn_ipv4_config_dns_options, ), .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default, - .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options), + .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default), ), ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY, @@ -5476,7 +5483,7 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = { .remove_fcn = _remove_fcn_ipv6_config_dns_options, ), .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default, - .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options), + .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default), ), ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY,