diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2013-02-07 14:49:53 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2013-03-13 17:47:11 +0100 |
| commit | df142a5dc4bde2f55abf2db19924dff96868056c (patch) | |
| tree | 5b78ed453aa2f2779e7d0e1a3d87dbdbcbb13659 /libnm-util/nm-setting-vpn.c | |
| parent | cc66b547cfcc7b7dcc45c4c47fccec2c483d225d (diff) | |
| download | NetworkManager-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-vpn.c')
| -rw-r--r-- | libnm-util/nm-setting-vpn.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 6484c1cbae..8d6031f891 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -18,7 +18,7 @@ * 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. */ @@ -26,6 +26,8 @@ #include <errno.h> #include <stdlib.h> #include <dbus/dbus-glib.h> +#include <glib/gi18n.h> + #include "nm-setting-vpn.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" @@ -380,27 +382,30 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); if (!priv->service_type) { - g_set_error (error, - NM_SETTING_VPN_ERROR, - NM_SETTING_VPN_ERROR_MISSING_PROPERTY, - NM_SETTING_VPN_SERVICE_TYPE); + g_set_error_literal (error, + NM_SETTING_VPN_ERROR, + NM_SETTING_VPN_ERROR_MISSING_PROPERTY, + _("property is missing")); + g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE); return FALSE; } if (!strlen (priv->service_type)) { - g_set_error (error, - NM_SETTING_VPN_ERROR, - NM_SETTING_VPN_ERROR_INVALID_PROPERTY, - NM_SETTING_VPN_SERVICE_TYPE); + g_set_error_literal (error, + NM_SETTING_VPN_ERROR, + NM_SETTING_VPN_ERROR_INVALID_PROPERTY, + _("property is empty")); + g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE); return FALSE; } /* default username can be NULL, but can't be zero-length */ if (priv->user_name && !strlen (priv->user_name)) { - g_set_error (error, - NM_SETTING_VPN_ERROR, - NM_SETTING_VPN_ERROR_INVALID_PROPERTY, - NM_SETTING_VPN_USER_NAME); + g_set_error_literal (error, + NM_SETTING_VPN_ERROR, + NM_SETTING_VPN_ERROR_INVALID_PROPERTY, + _("property is empty")); + g_prefix_error (error, "%s: ", NM_SETTING_VPN_USER_NAME); return FALSE; } |