summaryrefslogtreecommitdiff
path: root/libnm-util/nm-setting-connection.c
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2013-02-07 14:49:53 +0100
committerJiří Klimeš <jklimes@redhat.com>2013-03-13 17:47:11 +0100
commitdf142a5dc4bde2f55abf2db19924dff96868056c (patch)
tree5b78ed453aa2f2779e7d0e1a3d87dbdbcbb13659 /libnm-util/nm-setting-connection.c
parentcc66b547cfcc7b7dcc45c4c47fccec2c483d225d (diff)
downloadNetworkManager-df142a5dc4bde2f55abf2db19924dff96868056c.tar.gz
libnm-util: make property verification errors more descriptive
- fix g_set_error()/g_set_error_literal() usage - make the error messages translatable - use g_prefix_error() to prepend property name
Diffstat (limited to 'libnm-util/nm-setting-connection.c')
-rw-r--r--libnm-util/nm-setting-connection.c75
1 files changed, 44 insertions, 31 deletions
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index d4de1253d1..4dafb2b11f 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -19,11 +19,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * (C) Copyright 2007 - 2012 Red Hat, Inc.
+ * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc.
*/
#include <string.h>
+#include <glib/gi18n.h>
+
#include "nm-utils.h"
#include "nm-dbus-glib-types.h"
#include "nm-param-spec-specialized.h"
@@ -647,44 +649,51 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
if (!priv->id) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
- NM_SETTING_CONNECTION_ID);
+ g_set_error_literal (error,
+ NM_SETTING_CONNECTION_ERROR,
+ NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
+ _("property is missing"));
+ g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_ID);
return FALSE;
} else if (!strlen (priv->id)) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
- NM_SETTING_CONNECTION_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);
return FALSE;
}
if (!priv->uuid) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
- NM_SETTING_CONNECTION_UUID);
+ g_set_error_literal (error,
+ NM_SETTING_CONNECTION_ERROR,
+ NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
+ _("property is missing"));
+ g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID);
return FALSE;
} else if (!nm_utils_is_uuid (priv->uuid)) {
g_set_error (error,
NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
- NM_SETTING_CONNECTION_UUID);
+ _("'%s' is not a valid UUID"),
+ priv->uuid);
+ g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID);
return FALSE;
}
if (!priv->type) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
- NM_SETTING_CONNECTION_TYPE);
+ g_set_error_literal (error,
+ NM_SETTING_CONNECTION_ERROR,
+ NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
+ _("property is missing"));
+ g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE);
return FALSE;
} else if (!strlen (priv->type)) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
- NM_SETTING_CONNECTION_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);
return FALSE;
}
@@ -693,7 +702,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error,
NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND,
- NM_SETTING_CONNECTION_TYPE);
+ _("requires presence of '%s' setting in the connection"),
+ priv->type);
+ g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE);
return FALSE;
}
@@ -712,10 +723,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (strcmp (nm_setting_ip4_config_get_method (s_ip4),
NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
- "No IP configuration allowed for bonding slave");
+ g_set_error_literal (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);
return FALSE;
}
}
@@ -728,10 +740,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (strcmp (nm_setting_ip6_config_get_method (s_ip6),
NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
- "No IPv6 configuration allowed for bonding slave");
+ g_set_error_literal (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);
return FALSE;
}
}