colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-util: prefix errors with 'setting.property' instead of 'property' only

Browse Source
This commit is contained in:
Jiří Klimeš
2013-06-10 09:51:25 +02:00
parent 2cb9bc9bda
commit 816ac9ee70
21 changed files with 168 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libnm-util/nm-setting-8021x.c
View File

@@ -2168,14 +2168,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!priv->phase2_client_cert->len) { } else if (!priv->phase2_client_cert->len) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2185,14 +2185,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!priv->phase2_private_key->len) { } else if (!priv->phase2_private_key->len) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2204,7 +2204,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("has to match '%s' property for PKCS#12"), _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); 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; return FALSE;
} }
@@ -2216,7 +2216,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("has to match '%s' property for PKCS#12"), _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); 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; return FALSE;
} }
} }
@@ -2226,14 +2226,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!priv->client_cert->len) { } else if (!priv->client_cert->len) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2243,14 +2243,14 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!priv->private_key->len) { } else if (!priv->private_key->len) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2262,7 +2262,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("has to match '%s' property for PKCS#12"), _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PRIVATE_KEY); 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; return FALSE;
} }
@@ -2274,7 +2274,7 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("has to match '%s' property for PKCS#12"), _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PRIVATE_KEY); 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; return FALSE;
} }
} }
@@ -2295,25 +2295,25 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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)) { } else if (!strlen (priv->identity)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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) { } else if (!priv->anonymous_identity) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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 { } else {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2325,25 +2325,25 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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)) { } else if (!strlen (priv->phase2_auth)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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) { } else if (!priv->phase2_autheap) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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 { } else {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -2361,13 +2361,13 @@ verify_identity (NMSetting8021x *self, gboolean phase2, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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)) { } else if (!strlen (priv->identity)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; 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,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -2536,7 +2536,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -2545,7 +2545,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -2571,7 +2571,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->phase1_peapver); 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; return FALSE;
} }
@@ -2581,7 +2581,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->phase1_peaplabel); 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; return FALSE;
} }
@@ -2591,7 +2591,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->phase1_fast_provisioning); 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; return FALSE;
} }
@@ -2601,7 +2601,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->phase2_auth); 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; return FALSE;
} }
@@ -2611,7 +2611,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->phase2_autheap); 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; return FALSE;
} }

10
libnm-util/nm-setting-adsl.c
View File

@@ -210,14 +210,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_MISSING_PROPERTY, NM_SETTING_ADSL_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!strlen (priv->username)) { } else if (!strlen (priv->username)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -226,7 +226,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -238,7 +238,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->protocol); 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; return FALSE;
} }
@@ -249,7 +249,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->encapsulation); 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; return FALSE;
} }

10
libnm-util/nm-setting-bluetooth.c
View File

@@ -151,7 +151,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -160,7 +160,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -169,7 +169,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) &&
!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { !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, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->type); 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; return FALSE;
} }
@@ -200,7 +200,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND,
_("requires '%s' or '%s' setting"), _("requires '%s' or '%s' setting"),
NM_SETTING_GSM_SETTING_NAME, NM_SETTING_CDMA_SETTING_NAME); 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; return FALSE;
} }
} }

28
libnm-util/nm-setting-bond.c
View File

@@ -373,7 +373,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_MISSING_PROPERTY, NM_SETTING_BOND_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -382,7 +382,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_PROPERTY, NM_SETTING_BOND_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -397,7 +397,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("invalid option '%s' or its value '%s'"), _("invalid option '%s' or its value '%s'"),
key, value); 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; return FALSE;
} }
} }
@@ -417,7 +417,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
_("only one of '%s' and '%s' can be set"), _("only one of '%s' and '%s' can be set"),
NM_SETTING_BOND_OPTION_MIIMON, NM_SETTING_BOND_OPTION_MIIMON,
NM_SETTING_BOND_OPTION_ARP_INTERVAL); 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); 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, NM_SETTING_BOND_ERROR_MISSING_OPTION,
_("setting '%s' is required"), _("setting '%s' is required"),
NM_SETTING_BOND_OPTION_MODE); 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; return FALSE;
} }
if (!_nm_utils_string_in_list (value, valid_modes)) { 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, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' is not a valid value for '%s'"), _("'%s' is not a valid value for '%s'"),
value, NM_SETTING_BOND_OPTION_MODE); 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; return FALSE;
} }
@@ -449,7 +449,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s=%s' is incompatible with '%s > 0'"), _("'%s=%s' is incompatible with '%s > 0'"),
NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_BOND_OPTION_ARP_INTERVAL); 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; return FALSE;
} }
} }
@@ -460,7 +460,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s=%s' is not a valid configuration for '%s'"), _("'%s=%s' is not a valid configuration for '%s'"),
NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_INFINIBAND_SETTING_NAME); 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; return FALSE;
} }
} }
@@ -473,7 +473,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option requires setting '%s' option"), _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_UPDELAY, NM_SETTING_BOND_OPTION_MIIMON); 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; return FALSE;
} }
if (g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY)) { 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, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option requires setting '%s' option"), _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_DOWNDELAY, NM_SETTING_BOND_OPTION_MIIMON); 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; return FALSE;
} }
} }
@@ -502,7 +502,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_MISSING_OPTION, NM_SETTING_BOND_ERROR_MISSING_OPTION,
_("'%s' option requires setting '%s' option"), _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_ARP_INTERVAL, NM_SETTING_BOND_OPTION_ARP_IP_TARGET); 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; return FALSE;
} }
@@ -514,7 +514,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option is empty"), _("'%s' option is empty"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET); 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; return FALSE;
} }
@@ -526,7 +526,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' is not a valid IPv4 address for '%s' option"), _("'%s' is not a valid IPv4 address for '%s' option"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET, addrs[i]); 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; return FALSE;
} }
} }
@@ -538,7 +538,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option requires setting '%s' option"), _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET, NM_SETTING_BOND_OPTION_ARP_INTERVAL); 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; return FALSE;
} }
} }

8
libnm-util/nm-setting-bridge-port.c
View File

@@ -154,7 +154,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
_("'%d' is not a valid value for the property (should be <= %d)"), _("'%d' is not a valid value for the property (should be <= %d)"),
priv->priority, BR_MAX_PORT_PRIORITY); 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; return FALSE;
} }
@@ -164,7 +166,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
_("'%d' is not a valid value for the property (should be <= %d)"), _("'%d' is not a valid value for the property (should be <= %d)"),
priv->path_cost, BR_MAX_PATH_COST); 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; return FALSE;
} }

6
libnm-util/nm-setting-bridge.c
View File

@@ -250,7 +250,7 @@ check_range (guint32 val,
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
_("value '%d' is out of range <%d-%d>"), _("value '%d' is out of range <%d-%d>"),
val, min, max); val, min, max);
g_prefix_error (error, "%s: ", prop); g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, prop);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@@ -266,7 +266,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BRIDGE_ERROR, NM_SETTING_BRIDGE_ERROR,
NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -276,7 +276,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid interface name"), _("'%s' is not a valid interface name"),
priv->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; return FALSE;
} }

8
libnm-util/nm-setting-cdma.c
View File

@@ -161,14 +161,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_MISSING_PROPERTY, NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!strlen (priv->number)) { } else if (!strlen (priv->number)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
_("property is empty'")); _("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; return FALSE;
} }
@@ -177,7 +177,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -186,7 +186,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }

24
libnm-util/nm-setting-connection.c
View File

@@ -676,14 +676,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!strlen (priv->id)) { } else if (!strlen (priv->id)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -692,7 +692,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!nm_utils_is_uuid (priv->uuid)) { } else if (!nm_utils_is_uuid (priv->uuid)) {
g_set_error (error, g_set_error (error,
@@ -700,7 +700,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid UUID"), _("'%s' is not a valid UUID"),
priv->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; return FALSE;
} }
@@ -719,7 +719,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' doesn't match the virtual interface name '%s'"), _("'%s' doesn't match the virtual interface name '%s'"),
priv->interface_name, virtual_iface); 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; return FALSE;
} }
} else } else
@@ -735,7 +737,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid interface name"), _("'%s' is not a valid interface name"),
priv->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; return FALSE;
} }
} }
@@ -745,14 +747,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!strlen (priv->type)) { } else if (!strlen (priv->type)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -763,7 +765,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND,
_("requires presence of '%s' setting in the connection"), _("requires presence of '%s' setting in the connection"),
priv->type); 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; return FALSE;
} }
@@ -786,7 +788,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
_("IPv4 configuration is not allowed for bonding slave")); _("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; return FALSE;
} }
} }
@@ -803,7 +805,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
_("IPv6 configuration is not allowed for bonding slave")); _("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; return FALSE;
} }
} }

14
libnm-util/nm-setting-gsm.c
View File

@@ -282,7 +282,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -296,7 +296,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("property value '%s' is empty or too long (>64)"), _("property value '%s' is empty or too long (>64)"),
priv->apn); 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; return FALSE;
} }
@@ -328,7 +328,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("'%s' contains invalid char(s) (use [A-Za-z._-])"), _("'%s' contains invalid char(s) (use [A-Za-z._-])"),
priv->apn); 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; return FALSE;
} }
} }
@@ -339,7 +339,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -348,7 +348,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -363,7 +363,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("'%s' length is invalid (should be 5 or 6 digits)"), _("'%s' length is invalid (should be 5 or 6 digits)"),
priv->network_id); 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; return FALSE;
} }
@@ -374,7 +374,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
_("'%s' is not a number"), _("'%s' is not a number"),
priv->network_id); 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; return FALSE;
} }
} }

4
libnm-util/nm-setting-infiniband.c
View File

@@ -147,7 +147,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR,
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -162,7 +162,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR,
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }

24
libnm-util/nm-setting-ip4-config.c
View File

@@ -703,7 +703,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -713,7 +713,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL) } 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, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
@@ -735,7 +735,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
@@ -745,7 +745,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
} else if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) { } 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,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -764,7 +764,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -773,7 +773,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -788,7 +788,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("%d. IPv4 address is invalid"), _("%d. IPv4 address is invalid"),
i+1); 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; return FALSE;
} }
@@ -798,7 +798,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("%d. IPv4 address has invalid prefix"), _("%d. IPv4 address has invalid prefix"),
i+1); 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; return FALSE;
} }
} }
@@ -814,7 +814,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("%d. route is invalid"), _("%d. route is invalid"),
i+1); 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; return FALSE;
} }
@@ -824,7 +824,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
_("%d. route has invalid prefix"), _("%d. route has invalid prefix"),
i+1); 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; return FALSE;
} }
} }

14
libnm-util/nm-setting-ip6-config.c
View File

@@ -685,7 +685,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -695,7 +695,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) } 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"), _("'%s' not allowed for %s=%s"),
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP6_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
@@ -718,7 +718,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP6_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
@@ -728,7 +728,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
_("this property is not allowed for '%s=%s'"), _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method); 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; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) } 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,
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -748,7 +748,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }

8
libnm-util/nm-setting-olpc-mesh.c
View File

@@ -126,7 +126,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -135,7 +135,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
_("SSID length is out of range <1-32> bytes")); _("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; return FALSE;
} }
@@ -145,7 +145,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
_("'%d' is not a valid channel"), _("'%d' is not a valid channel"),
priv->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; return FALSE;
} }
@@ -154,7 +154,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }

4
libnm-util/nm-setting-ppp.c
View File

@@ -389,7 +389,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_PPP_ERROR_INVALID_PROPERTY, NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
_("'%d' is out of valid range <128-16384>"), _("'%d' is out of valid range <128-16384>"),
priv->mru); 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; return FALSE;
} }
} }
@@ -402,7 +402,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_PPP_ERROR_INVALID_PROPERTY, NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
_("setting this property requires non-zero '%s' property"), _("setting this property requires non-zero '%s' property"),
NM_SETTING_PPP_LCP_ECHO_INTERVAL); 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; return FALSE;
} }
} }

6
libnm-util/nm-setting-pppoe.c
View File

@@ -163,14 +163,14 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY, NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} else if (!strlen (priv->username)) { } else if (!strlen (priv->username)) {
g_set_error_literal (error, g_set_error_literal (error,
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -179,7 +179,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }

10
libnm-util/nm-setting-vlan.c
View File

@@ -477,7 +477,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid interface name"), _("'%s' is not a valid interface name"),
priv->iface_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; return FALSE;
} }
@@ -499,7 +499,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VLAN_ERROR_INVALID_PARENT, NM_SETTING_VLAN_ERROR_INVALID_PARENT,
_("'%s' value doesn't match '%s=%s'"), _("'%s' value doesn't match '%s=%s'"),
priv->parent, NM_SETTING_CONNECTION_MASTER, master); 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; return FALSE;
} }
} }
@@ -510,7 +510,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
_("'%s' is neither an UUID nor an interface name"), _("'%s' is neither an UUID nor an interface name"),
priv->parent); 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; return FALSE;
} }
} else { } else {
@@ -523,7 +523,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, NM_SETTING_VLAN_ERROR_MISSING_PROPERTY,
_("property is not specified and neither is '%s:%s'"), _("property is not specified and neither is '%s:%s'"),
NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); 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; return FALSE;
} }
} }
@@ -535,7 +535,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
_("flags are invalid")); _("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; return FALSE;
} }

6
libnm-util/nm-setting-vpn.c
View File

@@ -404,7 +404,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_MISSING_PROPERTY, NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -413,7 +413,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_INVALID_PROPERTY, NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -423,7 +423,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_INVALID_PROPERTY, NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }

6
libnm-util/nm-setting-wimax.c
View File

@@ -135,7 +135,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY, NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -144,7 +144,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -153,7 +153,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }

16
libnm-util/nm-setting-wired.c
View File

@@ -561,7 +561,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid ethernet port value"), _("'%s' is not a valid ethernet port value"),
priv->port); 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; return FALSE;
} }
@@ -571,7 +571,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid duplex value"), _("'%s' is not a valid duplex value"),
priv->duplex); 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; return FALSE;
} }
@@ -580,7 +580,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("is not a valid MAC address")); _("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; return FALSE;
} }
@@ -594,7 +594,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid MAC address"), _("'%s' is not a valid MAC address"),
(const char *) mac_blacklist_iter->data); (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; return FALSE;
} }
} }
@@ -605,7 +605,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -614,7 +614,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -628,7 +628,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("invalid '%s' or its value '%s'"), _("invalid '%s' or its value '%s'"),
key, value); 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; return FALSE;
} }
} }
@@ -638,7 +638,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
_("is not a valid MAC address")); _("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; return FALSE;
} }

40
libnm-util/nm-setting-wireless-security.c
View File

@@ -802,7 +802,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -812,7 +812,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid value for the property"), _("'%s' is not a valid value for the property"),
priv->key_mgmt); 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; return FALSE;
} }
@@ -824,7 +824,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,
_("'%s' security requires '%s=%s'"), _("'%s' security requires '%s=%s'"),
"leap", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x"); "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; return FALSE;
} }
if (!priv->leap_username) { 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME,
_("property is empty")); _("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; return FALSE;
} }
if (priv->leap_password && !strlen (priv->leap_password)) { 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
} else { } else {
@@ -853,7 +853,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING,
_("'%s' security requires '%s' setting presence"), _("'%s' security requires '%s' setting presence"),
priv->key_mgmt, NM_SETTING_802_1X_SETTING_NAME); 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; return FALSE;
} }
} }
@@ -864,7 +864,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is empty")); _("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; return FALSE;
} }
@@ -874,7 +874,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("'%d' value is out of range <0-3>"), _("'%d' value is out of range <0-3>"),
priv->wep_tx_keyidx); 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; return FALSE;
} }
@@ -883,7 +883,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -892,7 +892,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
if (priv->wep_key1 && !nm_utils_wep_key_valid (priv->wep_key1, priv->wep_key_type)) { 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
if (priv->wep_key2 && !nm_utils_wep_key_valid (priv->wep_key2, priv->wep_key_type)) { 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
if (priv->wep_key3 && !nm_utils_wep_key_valid (priv->wep_key3, priv->wep_key_type)) { 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -925,7 +925,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -934,7 +934,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -943,7 +943,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -971,7 +971,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("'%s' connections require '%s' in this property"), _("'%s' connections require '%s' in this property"),
NM_SETTING_WIRELESS_MODE_ADHOC, "none"); 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; return FALSE;
} }
} else if (!_nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) { } 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,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
} }
@@ -989,7 +989,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -1001,7 +1001,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP, NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP,
_("'%s' can only be used with '%s=%s' (WEP)"), _("'%s' can only be used with '%s=%s' (WEP)"),
"shared", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none"); "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; return FALSE;
} }
} }

24
libnm-util/nm-setting-wireless.c
View File

@@ -709,7 +709,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY, NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,
_("property is missing")); _("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; return FALSE;
} }
@@ -718,7 +718,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("SSID length is out of range <1-32> bytes")); _("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; return FALSE;
} }
@@ -728,7 +728,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid Wi-Fi mode"), _("'%s' is not a valid Wi-Fi mode"),
priv->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; return FALSE;
} }
@@ -738,7 +738,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid band"), _("'%s' is not a valid band"),
priv->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; return FALSE;
} }
@@ -748,7 +748,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND, NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND,
_("requires setting '%s' property"), _("requires setting '%s' property"),
NM_SETTING_WIRELESS_BAND); 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; return FALSE;
} }
@@ -759,7 +759,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("'%d' is not a valid channel"), _("'%d' is not a valid channel"),
priv->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; return FALSE;
} }
} }
@@ -769,7 +769,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -778,7 +778,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -787,7 +787,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("property is invalid")); _("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; return FALSE;
} }
@@ -800,7 +800,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid MAC address"), _("'%s' is not a valid MAC address"),
(const char *) iter->data); (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; return FALSE;
} }
} }
@@ -814,7 +814,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
_("'%s' is not a valid MAC address"), _("'%s' is not a valid MAC address"),
(const char *) iter->data); (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; return FALSE;
} }
} }
@@ -826,7 +826,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING,
_("'%s' setting is required for the connection when the property is set"), _("'%s' setting is required for the connection when the property is set"),
priv->security); 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; return FALSE;
} }