diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index c118ff425..58b2a4491 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -2168,14 +2168,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_CLIENT_CERT); return FALSE; } else if (!priv->phase2_client_cert->len) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_CLIENT_CERT); return FALSE; } @@ -2185,14 +2185,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); return FALSE; } else if (!priv->phase2_private_key->len) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); return FALSE; } @@ -2204,7 +2204,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("has to match '%s' property for PKCS#12"), NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_CLIENT_CERT); return FALSE; } @@ -2216,7 +2216,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("has to match '%s' property for PKCS#12"), NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_CLIENT_CERT); return FALSE; } } @@ -2226,14 +2226,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_CLIENT_CERT); return FALSE; } else if (!priv->client_cert->len) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_CLIENT_CERT); return FALSE; } @@ -2243,14 +2243,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PRIVATE_KEY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PRIVATE_KEY); return FALSE; } else if (!priv->private_key->len) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PRIVATE_KEY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PRIVATE_KEY); return FALSE; } @@ -2262,7 +2262,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("has to match '%s' property for PKCS#12"), NM_SETTING_802_1X_PRIVATE_KEY); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_CLIENT_CERT); return FALSE; } @@ -2274,7 +2274,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("has to match '%s' property for PKCS#12"), NM_SETTING_802_1X_PRIVATE_KEY); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_CLIENT_CERT); return FALSE; } } @@ -2295,25 +2295,25 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY); } else if (!strlen (priv->identity)) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY); } else if (!priv->anonymous_identity) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_ANONYMOUS_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_ANONYMOUS_IDENTITY); } else { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_ANONYMOUS_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_ANONYMOUS_IDENTITY); } return FALSE; } @@ -2325,25 +2325,25 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTH); } else if (!strlen (priv->phase2_auth)) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTH); } else if (!priv->phase2_autheap) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTHEAP); } else { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTHEAP); } return FALSE; } @@ -2361,13 +2361,13 @@ verify_identity (NMSetting8021x *self, gboolean phase2, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY); } else if (!strlen (priv->identity)) { g_set_error_literal (error, NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY); } return TRUE; @@ -2511,7 +2511,7 @@ verify_cert (GByteArray *array, const char *prop_name, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", prop_name); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, prop_name); return FALSE; } @@ -2536,7 +2536,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_EAP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_EAP); return FALSE; } @@ -2545,7 +2545,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_EAP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_EAP); return FALSE; } @@ -2571,7 +2571,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->phase1_peapver); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_PEAPVER); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE1_PEAPVER); return FALSE; } @@ -2581,7 +2581,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->phase1_peaplabel); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_PEAPLABEL); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE1_PEAPLABEL); return FALSE; } @@ -2591,7 +2591,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->phase1_fast_provisioning); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING); return FALSE; } @@ -2601,7 +2601,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->phase2_auth); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTH); return FALSE; } @@ -2611,7 +2611,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->phase2_autheap); - g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_PHASE2_AUTHEAP); return FALSE; } diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index 422e44c58..981b5cfe5 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -210,14 +210,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_ADSL_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME); return FALSE; } else if (!strlen (priv->username)) { g_set_error_literal (error, NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_ADSL_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME); return FALSE; } @@ -226,7 +226,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_ADSL_PASSWORD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PASSWORD); return FALSE; } @@ -238,7 +238,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->protocol); - g_prefix_error (error, "%s: ", NM_SETTING_ADSL_PROTOCOL); + g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PROTOCOL); return FALSE; } @@ -249,7 +249,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->encapsulation); - g_prefix_error (error, "%s: ", NM_SETTING_ADSL_ENCAPSULATION); + g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_ENCAPSULATION); return FALSE; } diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 9e52a3f29..99c316c30 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -151,7 +151,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_BDADDR); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_BDADDR); return FALSE; } @@ -160,7 +160,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_BDADDR); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_BDADDR); return FALSE; } @@ -169,7 +169,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE); return FALSE; } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { @@ -178,7 +178,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->type); - g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE); return FALSE; } @@ -200,7 +200,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, _("requires '%s' or '%s' setting"), NM_SETTING_GSM_SETTING_NAME, NM_SETTING_CDMA_SETTING_NAME); - g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE); return FALSE; } } diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index 117051ba0..ba2fed81a 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -373,7 +373,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_INTERFACE_NAME); return FALSE; } @@ -382,7 +382,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_INTERFACE_NAME); return FALSE; } @@ -397,7 +397,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("invalid option '%s' or its value '%s'"), key, value); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } @@ -417,7 +417,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) _("only one of '%s' and '%s' can be set"), NM_SETTING_BOND_OPTION_MIIMON, NM_SETTING_BOND_OPTION_ARP_INTERVAL); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); } value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_MODE); @@ -427,7 +427,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_MISSING_OPTION, _("setting '%s' is required"), NM_SETTING_BOND_OPTION_MODE); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } if (!_nm_utils_string_in_list (value, valid_modes)) { @@ -436,7 +436,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' is not a valid value for '%s'"), value, NM_SETTING_BOND_OPTION_MODE); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } @@ -449,7 +449,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s=%s' is incompatible with '%s > 0'"), NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_BOND_OPTION_ARP_INTERVAL); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } @@ -460,7 +460,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s=%s' is not a valid configuration for '%s'"), NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_INFINIBAND_SETTING_NAME); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } @@ -473,7 +473,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' option requires setting '%s' option"), NM_SETTING_BOND_OPTION_UPDELAY, NM_SETTING_BOND_OPTION_MIIMON); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } if (g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY)) { @@ -482,7 +482,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' option requires setting '%s' option"), NM_SETTING_BOND_OPTION_DOWNDELAY, NM_SETTING_BOND_OPTION_MIIMON); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } @@ -502,7 +502,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_MISSING_OPTION, _("'%s' option requires setting '%s' option"), NM_SETTING_BOND_OPTION_ARP_INTERVAL, NM_SETTING_BOND_OPTION_ARP_IP_TARGET); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } @@ -514,7 +514,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' option is empty"), NM_SETTING_BOND_OPTION_ARP_IP_TARGET); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } @@ -526,7 +526,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' is not a valid IPv4 address for '%s' option"), NM_SETTING_BOND_OPTION_ARP_IP_TARGET, addrs[i]); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } @@ -538,7 +538,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BOND_ERROR_INVALID_OPTION, _("'%s' option requires setting '%s' option"), NM_SETTING_BOND_OPTION_ARP_IP_TARGET, NM_SETTING_BOND_OPTION_ARP_INTERVAL); - g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS); return FALSE; } } diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index cf5f8da9c..67c91a9cd 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -154,7 +154,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, _("'%d' is not a valid value for the property (should be <= %d)"), priv->priority, BR_MAX_PORT_PRIORITY); - g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_PORT_PRIORITY); + g_prefix_error (error, "%s.%s: ", + NM_SETTING_BRIDGE_PORT_SETTING_NAME, + NM_SETTING_BRIDGE_PORT_PRIORITY); return FALSE; } @@ -164,7 +166,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, _("'%d' is not a valid value for the property (should be <= %d)"), priv->path_cost, BR_MAX_PATH_COST); - g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_PORT_PATH_COST); + g_prefix_error (error, "%s.%s: ", + NM_SETTING_BRIDGE_PORT_SETTING_NAME, + NM_SETTING_BRIDGE_PORT_PATH_COST); return FALSE; } diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 6327a2f50..64d3fc81c 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -250,7 +250,7 @@ check_range (guint32 val, NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, _("value '%d' is out of range <%d-%d>"), val, min, max); - g_prefix_error (error, "%s: ", prop); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, prop); return FALSE; } return TRUE; @@ -266,7 +266,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BRIDGE_ERROR, NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_INTERFACE_NAME); return FALSE; } @@ -276,7 +276,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, _("'%s' is not a valid interface name"), priv->interface_name); - g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_INTERFACE_NAME); return FALSE; } diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 5f356c857..8560e82b6 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -161,14 +161,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_CDMA_NUMBER); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_NUMBER); return FALSE; } else if (!strlen (priv->number)) { g_set_error_literal (error, NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, _("property is empty'")); - g_prefix_error (error, "%s: ", NM_SETTING_CDMA_NUMBER); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_NUMBER); return FALSE; } @@ -177,7 +177,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_CDMA_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_USERNAME); return FALSE; } @@ -186,7 +186,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_CDMA_PASSWORD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CDMA_SETTING_NAME, NM_SETTING_CDMA_PASSWORD); return FALSE; } diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 6abf6817c..49ffc5aba 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -676,14 +676,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_ID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_ID); return FALSE; } else if (!strlen (priv->id)) { g_set_error_literal (error, NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_ID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_ID); return FALSE; } @@ -692,7 +692,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_UUID); return FALSE; } else if (!nm_utils_is_uuid (priv->uuid)) { g_set_error (error, @@ -700,7 +700,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' is not a valid UUID"), priv->uuid); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_UUID); return FALSE; } @@ -719,7 +719,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' doesn't match the virtual interface name '%s'"), priv->interface_name, virtual_iface); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_INTERFACE_NAME); return FALSE; } } else @@ -735,7 +737,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' is not a valid interface name"), priv->interface_name); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME); return FALSE; } } @@ -745,14 +747,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_TYPE); return FALSE; } else if (!strlen (priv->type)) { g_set_error_literal (error, NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_TYPE); return FALSE; } @@ -763,7 +765,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, _("requires presence of '%s' setting in the connection"), priv->type); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_TYPE); return FALSE; } @@ -786,7 +788,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, _("IPv4 configuration is not allowed for bonding slave")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SLAVE_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE); return FALSE; } } @@ -803,7 +805,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, _("IPv6 configuration is not allowed for bonding slave")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SLAVE_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE); return FALSE; } } diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index d9f80079d..3a3193275 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -282,7 +282,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_NUMBER); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_NUMBER); return FALSE; } @@ -296,7 +296,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("property value '%s' is empty or too long (>64)"), priv->apn); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_APN); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_APN); return FALSE; } @@ -328,7 +328,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("'%s' contains invalid char(s) (use [A-Za-z._-])"), priv->apn); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_APN); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_APN); return FALSE; } } @@ -339,7 +339,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_USERNAME); return FALSE; } @@ -348,7 +348,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_USERNAME); return FALSE; } @@ -363,7 +363,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("'%s' length is invalid (should be 5 or 6 digits)"), priv->network_id); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_NETWORK_ID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_NETWORK_ID); return FALSE; } @@ -374,7 +374,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_GSM_ERROR_INVALID_PROPERTY, _("'%s' is not a number"), priv->network_id); - g_prefix_error (error, "%s: ", NM_SETTING_GSM_NETWORK_ID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_GSM_SETTING_NAME, NM_SETTING_GSM_NETWORK_ID); return FALSE; } } diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index 137fd6f13..d7feec5fd 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -147,7 +147,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_MAC_ADDRESS); return FALSE; } @@ -162,7 +162,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_TRANSPORT_MODE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_TRANSPORT_MODE); return FALSE; } diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 87550f1e0..6caf864a6 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -703,7 +703,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_METHOD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_METHOD); return FALSE; } @@ -713,7 +713,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } } else if ( !strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL) @@ -725,7 +725,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, _("this property is not allowed for '%s=%s'"), NM_SETTING_IP4_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DNS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); return FALSE; } @@ -735,7 +735,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, _("this property is not allowed for '%s=%s'"), NM_SETTING_IP4_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DNS_SEARCH); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS_SEARCH); return FALSE; } @@ -745,7 +745,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, _("this property is not allowed for '%s=%s'"), NM_SETTING_IP4_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } } else if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) { @@ -755,7 +755,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_METHOD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_METHOD); return FALSE; } @@ -764,7 +764,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID); return FALSE; } @@ -773,7 +773,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME); return FALSE; } @@ -788,7 +788,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("%d. IPv4 address is invalid"), i+1); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } @@ -798,7 +798,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("%d. IPv4 address has invalid prefix"), i+1); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } } @@ -814,7 +814,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("%d. route is invalid"), i+1); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ROUTES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ROUTES); return FALSE; } @@ -824,7 +824,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, _("%d. route has invalid prefix"), i+1); - g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ROUTES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ROUTES); return FALSE; } } diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index e2d329b8a..950a70cfc 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -685,7 +685,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_METHOD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_METHOD); return FALSE; } @@ -695,7 +695,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_ADDRESSES); return FALSE; } } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) @@ -708,7 +708,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) _("'%s' not allowed for %s=%s"), _("this property is not allowed for '%s=%s'"), NM_SETTING_IP6_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DNS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_DNS); return FALSE; } @@ -718,7 +718,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, _("this property is not allowed for '%s=%s'"), NM_SETTING_IP6_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DNS_SEARCH); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_DNS_SEARCH); return FALSE; } @@ -728,7 +728,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, _("this property is not allowed for '%s=%s'"), NM_SETTING_IP4_CONFIG_METHOD, priv->method); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_ADDRESSES); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_ADDRESSES); return FALSE; } } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) @@ -739,7 +739,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_METHOD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_METHOD); return FALSE; } @@ -748,7 +748,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME); return FALSE; } diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index 0dfb97329..3fef364e6 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -126,7 +126,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_SSID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_SSID); return FALSE; } @@ -135,7 +135,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, _("SSID length is out of range <1-32> bytes")); - g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_SSID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_SSID); return FALSE; } @@ -145,7 +145,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, _("'%d' is not a valid channel"), priv->channel); - g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_CHANNEL); + g_prefix_error (error, "%s.%s: ", NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_CHANNEL); return FALSE; } @@ -154,7 +154,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_OLPC_MESH_SETTING_NAME, NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS); return FALSE; } diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 70d46db8b..892a32051 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -389,7 +389,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_PPP_ERROR_INVALID_PROPERTY, _("'%d' is out of valid range <128-16384>"), priv->mru); - g_prefix_error (error, "%s: ", NM_SETTING_PPP_MRU); + g_prefix_error (error, "%s.%s: ", NM_SETTING_PPP_SETTING_NAME, NM_SETTING_PPP_MRU); return FALSE; } } @@ -402,7 +402,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_PPP_ERROR_INVALID_PROPERTY, _("setting this property requires non-zero '%s' property"), NM_SETTING_PPP_LCP_ECHO_INTERVAL); - g_prefix_error (error, "%s: ", NM_SETTING_PPP_LCP_ECHO_FAILURE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_PPP_SETTING_NAME, NM_SETTING_PPP_LCP_ECHO_FAILURE); return FALSE; } } diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index 9199e6a18..af718ffa6 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -163,14 +163,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_USERNAME); return FALSE; } else if (!strlen (priv->username)) { g_set_error_literal (error, NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_USERNAME); return FALSE; } @@ -179,7 +179,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_SERVICE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_PPPOE_SETTING_NAME, NM_SETTING_PPPOE_SERVICE); return FALSE; } diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index d21c0057d..72b623bac 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -477,7 +477,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, _("'%s' is not a valid interface name"), priv->iface_name); - g_prefix_error (error, "%s: ", NM_SETTING_VLAN_INTERFACE_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_INTERFACE_NAME); return FALSE; } @@ -499,7 +499,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VLAN_ERROR_INVALID_PARENT, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_MASTER, master); - g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT); return FALSE; } } @@ -510,7 +510,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, _("'%s' is neither an UUID nor an interface name"), priv->parent); - g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT); return FALSE; } } else { @@ -523,7 +523,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, _("property is not specified and neither is '%s:%s'"), NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); - g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT); return FALSE; } } @@ -535,7 +535,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, _("flags are invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_VLAN_FLAGS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_FLAGS); return FALSE; } diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 5bb4a1813..0e8229527 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -404,7 +404,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VPN_SETTING_NAME, NM_SETTING_VPN_SERVICE_TYPE); return FALSE; } @@ -413,7 +413,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VPN_SETTING_NAME, NM_SETTING_VPN_SERVICE_TYPE); return FALSE; } @@ -423,7 +423,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_VPN_USER_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VPN_SETTING_NAME, NM_SETTING_VPN_USER_NAME); return FALSE; } diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 0b7090716..397cf28bc 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -135,7 +135,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_NETWORK_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIMAX_SETTING_NAME, NM_SETTING_WIMAX_NETWORK_NAME); return FALSE; } @@ -144,7 +144,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_NETWORK_NAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIMAX_SETTING_NAME, NM_SETTING_WIMAX_NETWORK_NAME); return FALSE; } @@ -153,7 +153,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIMAX_SETTING_NAME, NM_SETTING_WIMAX_MAC_ADDRESS); return FALSE; } diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 064b53707..8102f7a4e 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -561,7 +561,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("'%s' is not a valid ethernet port value"), priv->port); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_PORT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_PORT); return FALSE; } @@ -571,7 +571,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("'%s' is not a valid duplex value"), priv->duplex); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_DUPLEX); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_DUPLEX); return FALSE; } @@ -580,7 +580,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("is not a valid MAC address")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); return FALSE; } @@ -594,7 +594,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("'%s' is not a valid MAC address"), (const char *) mac_blacklist_iter->data); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); return FALSE; } } @@ -605,7 +605,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_SUBCHANNELS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_S390_SUBCHANNELS); return FALSE; } @@ -614,7 +614,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_NETTYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_S390_NETTYPE); return FALSE; } @@ -628,7 +628,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("invalid '%s' or its value '%s'"), key, value); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_OPTIONS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_S390_OPTIONS); return FALSE; } } @@ -638,7 +638,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, _("is not a valid MAC address")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRED_CLONED_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_CLONED_MAC_ADDRESS); return FALSE; } diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 62d60aac0..4c8cb1b2d 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -802,7 +802,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); return FALSE; } @@ -812,7 +812,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("'%s' is not a valid value for the property"), priv->key_mgmt); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); return FALSE; } @@ -824,7 +824,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X, _("'%s' security requires '%s=%s'"), "leap", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x"); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); return FALSE; } if (!priv->leap_username) { @@ -832,7 +832,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); return FALSE; } if (priv->leap_password && !strlen (priv->leap_password)) { @@ -840,7 +840,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD); return FALSE; } } else { @@ -853,7 +853,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, _("'%s' security requires '%s' setting presence"), priv->key_mgmt, NM_SETTING_802_1X_SETTING_NAME); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); return FALSE; } } @@ -864,7 +864,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is empty")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); return FALSE; } @@ -874,7 +874,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("'%d' value is out of range <0-3>"), priv->wep_tx_keyidx); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX); return FALSE; } @@ -883,7 +883,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE); return FALSE; } @@ -892,7 +892,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); return FALSE; } if (priv->wep_key1 && !nm_utils_wep_key_valid (priv->wep_key1, priv->wep_key_type)) { @@ -900,7 +900,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY1); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_KEY1); return FALSE; } if (priv->wep_key2 && !nm_utils_wep_key_valid (priv->wep_key2, priv->wep_key_type)) { @@ -908,7 +908,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY2); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2); return FALSE; } if (priv->wep_key3 && !nm_utils_wep_key_valid (priv->wep_key3, priv->wep_key_type)) { @@ -916,7 +916,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY3); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3); return FALSE; } @@ -925,7 +925,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); return FALSE; } @@ -934,7 +934,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PSK); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PSK); return FALSE; } @@ -943,7 +943,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PROTO); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PROTO); return FALSE; } @@ -971,7 +971,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("'%s' connections require '%s' in this property"), NM_SETTING_WIRELESS_MODE_ADHOC, "none"); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PAIRWISE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PAIRWISE); return FALSE; } } else if (!_nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) { @@ -979,7 +979,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PAIRWISE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PAIRWISE); return FALSE; } } @@ -989,7 +989,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_GROUP); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_GROUP); return FALSE; } @@ -1001,7 +1001,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP, _("'%s' can only be used with '%s=%s' (WEP)"), "shared", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none"); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); return FALSE; } } diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 3fb98d3eb..655d717e6 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -709,7 +709,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY, _("property is missing")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SSID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SSID); return FALSE; } @@ -718,7 +718,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("SSID length is out of range <1-32> bytes")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SSID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SSID); return FALSE; } @@ -728,7 +728,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("'%s' is not a valid Wi-Fi mode"), priv->mode); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MODE); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MODE); return FALSE; } @@ -738,7 +738,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("'%s' is not a valid band"), priv->band); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_BAND); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_BAND); return FALSE; } @@ -748,7 +748,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND, _("requires setting '%s' property"), NM_SETTING_WIRELESS_BAND); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CHANNEL); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_CHANNEL); return FALSE; } @@ -759,7 +759,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("'%d' is not a valid channel"), priv->channel); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CHANNEL); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_CHANNEL); return FALSE; } } @@ -769,7 +769,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_BSSID); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_BSSID); return FALSE; } @@ -778,7 +778,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MAC_ADDRESS); return FALSE; } @@ -787,7 +787,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS); return FALSE; } @@ -800,7 +800,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("'%s' is not a valid MAC address"), (const char *) iter->data); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); return FALSE; } } @@ -814,7 +814,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, _("'%s' is not a valid MAC address"), (const char *) iter->data); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SEEN_BSSIDS); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SEEN_BSSIDS); return FALSE; } } @@ -826,7 +826,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, _("'%s' setting is required for the connection when the property is set"), priv->security); - g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SEC); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SEC); return FALSE; }