diff options
Diffstat (limited to 'libnm-util/nm-setting-olpc-mesh.c')
| -rw-r--r-- | libnm-util/nm-setting-olpc-mesh.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index bf87aa578e..0dfb97329b 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -20,7 +20,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. + * (C) Copyright 2007 - 2013 Red Hat, Inc. * (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2009 One Laptop per Child */ @@ -28,6 +28,7 @@ #include <string.h> #include <netinet/ether.h> #include <dbus/dbus-glib.h> +#include <glib/gi18n.h> #include "NetworkManager.h" #include "nm-setting-olpc-mesh.h" @@ -121,18 +122,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (setting); if (!priv->ssid) { - g_set_error (error, - NM_SETTING_OLPC_MESH_ERROR, - NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY, - NM_SETTING_OLPC_MESH_SSID); + g_set_error_literal (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); return FALSE; } if (!priv->ssid->len || priv->ssid->len > 32) { - g_set_error (error, - NM_SETTING_OLPC_MESH_ERROR, - NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, - NM_SETTING_OLPC_MESH_SSID); + g_set_error_literal (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); return FALSE; } @@ -140,15 +143,18 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) g_set_error (error, NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, - NM_SETTING_OLPC_MESH_CHANNEL); + _("'%d' is not a valid channel"), + priv->channel); + g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_CHANNEL); return FALSE; } if (priv->dhcp_anycast_addr && priv->dhcp_anycast_addr->len != ETH_ALEN) { - g_set_error (error, - NM_SETTING_OLPC_MESH_ERROR, - NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, - NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS); + g_set_error_literal (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); return FALSE; } |