diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
| commit | e847e3cc3e4eded45a358bf838e1edcf4c12fcb5 (patch) | |
| tree | 9db16e390931b9b800a174c7117b9297b351283f /libnm-util/nm-setting-connection.c | |
| parent | 1cd35b49de89f65c386ae2ff98a8e08342c080b0 (diff) | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Merge tag 'upstream/1.0.2'
Upstream version 1.0.2
Diffstat (limited to 'libnm-util/nm-setting-connection.c')
| -rw-r--r-- | libnm-util/nm-setting-connection.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 162ae7cb..bda89d63 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -882,19 +882,21 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) if (is_slave) { if (!priv->master) { - g_set_error_literal (error, - NM_SETTING_CONNECTION_ERROR, - NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, - _("Slave connections need a valid '" NM_SETTING_CONNECTION_MASTER "' property")); + g_set_error (error, + NM_SETTING_CONNECTION_ERROR, + NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, + _("Slave connections need a valid '%s' property"), + NM_SETTING_CONNECTION_MASTER); g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER); return NM_SETTING_VERIFY_ERROR; } } else { if (priv->master) { - g_set_error_literal (error, - NM_SETTING_CONNECTION_ERROR, - NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, - _("Cannot set '" NM_SETTING_CONNECTION_MASTER "' without '" NM_SETTING_CONNECTION_SLAVE_TYPE "'")); + g_set_error (error, + NM_SETTING_CONNECTION_ERROR, + NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, + _("Cannot set '%s' without '%s'"), + NM_SETTING_CONNECTION_MASTER, NM_SETTING_CONNECTION_SLAVE_TYPE); g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE); return NM_SETTING_VERIFY_ERROR; } |