[network-manager-openvpn] trivial: rename OPENVPN_EDITOR_PLUGIN_ERROR to NMV_EDITOR_PLUGIN_ERROR
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn] trivial: rename OPENVPN_EDITOR_PLUGIN_ERROR to NMV_EDITOR_PLUGIN_ERROR
- Date: Tue, 10 May 2016 11:12:07 +0000 (UTC)
commit b4a85f5d4c662b39b11e457220eb9f5b838a8537
Author: Thomas Haller <thaller redhat com>
Date: Tue May 10 13:08:42 2016 +0200
trivial: rename OPENVPN_EDITOR_PLUGIN_ERROR to NMV_EDITOR_PLUGIN_ERROR
We use a similar error define for other VPN plugins. Don't name them
differently accross the projects.
properties/auth-helpers.c | 40 ++++++++++++++++----------------
properties/import-export.c | 36 ++++++++++++++--------------
properties/nm-openvpn-editor-plugin.c | 4 +-
properties/nm-openvpn-editor.c | 10 ++++----
shared/nm-default.h | 28 +++++++++++-----------
5 files changed, 59 insertions(+), 59 deletions(-)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 1be3352..0bf4a45 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -430,8 +430,8 @@ validate_tls (GtkBuilder *builder, const char *prefix, GError **error)
g_free (tmp);
if (!valid) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_CA);
return FALSE;
}
@@ -441,8 +441,8 @@ validate_tls (GtkBuilder *builder, const char *prefix, GError **error)
g_free (tmp);
if (!valid) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_CERT);
return FALSE;
}
@@ -453,8 +453,8 @@ validate_tls (GtkBuilder *builder, const char *prefix, GError **error)
g_free (tmp);
if (!valid) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_KEY);
return FALSE;
}
@@ -475,8 +475,8 @@ validate_tls (GtkBuilder *builder, const char *prefix, GError **error)
if (encrypted && secrets_required) {
if (!gtk_entry_get_text_length (GTK_ENTRY (widget))) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_CERTPASS);
return FALSE;
}
@@ -502,16 +502,16 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_USERNAME);
return FALSE;
}
} else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) {
if (!validate_file_chooser (builder, "pw_ca_cert_chooser")) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_CA);
return FALSE;
}
@@ -519,16 +519,16 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_USERNAME);
return FALSE;
}
} else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) {
if (!validate_file_chooser (builder, "sk_key_chooser")) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_STATIC_KEY);
return FALSE;
}
@@ -537,8 +537,8 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_LOCAL_IP);
return FALSE;
}
@@ -547,8 +547,8 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (!str || !strlen (str)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_REMOTE_IP);
return FALSE;
}
diff --git a/properties/import-export.c b/properties/import-export.c
index 8cf4884..8e77419 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -696,8 +696,8 @@ inline_blob_write_out (const InlineBlobData *data, GError **error)
/* in test mode we don't create the certificate directory. */
if (!inline_blob_mkdir_parents (data, data->path, &err_msg)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FAILED,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FAILED,
_("cannot write <%s> blob from line %ld to file (%s)"),
data->token,
(long) data->token_start_line,
@@ -713,8 +713,8 @@ inline_blob_write_out (const InlineBlobData *data, GError **error)
* access the file later on is left as exercise for the user. */
if (!g_file_set_contents (data->path, data->blob_data->str, data->blob_data->len, NULL)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FAILED,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FAILED,
_("cannot write <%s> blob from line %ld to file '%s'"),
data->token,
(long) data->token_start_line,
@@ -1374,8 +1374,8 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
handle_line_error:
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_INVALID,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_INVALID,
_("configuration error: %s (line %ld)"),
line_error ? : _("unknown or unsupported option"),
(long) contents_cur_line);
@@ -1385,16 +1385,16 @@ handle_line_error:
if (!have_client && !have_sk) {
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("The file to import wasn't a valid OpenVPN client configuration"));
goto out_error;
}
if (!have_remote) {
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("The file to import wasn't a valid OpenVPN configure (no remote)"));
goto out_error;
}
@@ -1625,8 +1625,8 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
if (!path || !path[0]) {
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("missing path argument"));
return NULL;
}
@@ -1635,8 +1635,8 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
s_vpn = nm_connection_get_setting_vpn (connection);
if (!s_con || !s_vpn) {
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("connection is not a valid OpenVPN connection"));
return NULL;
}
@@ -1644,8 +1644,8 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
gateways = _arg_is_set (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE));
if (!gateways) {
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("connection was incomplete (missing gateway)"));
return NULL;
}
@@ -1945,8 +1945,8 @@ do_export (const char *path, NMConnection *connection, GError **error)
if (!g_file_set_contents (path, f->str, f->len, &local)) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("failed to write file: %s"),
local->message);
return FALSE;
diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-openvpn-editor-plugin.c
index 191b2de..6fd2636 100644
--- a/properties/nm-openvpn-editor-plugin.c
+++ b/properties/nm-openvpn-editor-plugin.c
@@ -76,8 +76,8 @@ import (NMVpnEditorPlugin *iface, const char *path, GError **error)
&& !g_str_has_suffix (ext, ".cnf")
&& !g_str_has_suffix (ext, ".ovpntest"))) { /* Special extension for testcases */
g_set_error_literal (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN,
_("unknown OpenVPN file extension"));
goto out;
}
diff --git a/properties/nm-openvpn-editor.c b/properties/nm-openvpn-editor.c
index 2e09d2d..f8acb9f 100644
--- a/properties/nm-openvpn-editor.c
+++ b/properties/nm-openvpn-editor.c
@@ -131,8 +131,8 @@ check_validity (OpenvpnEditor *self, GError **error)
gtk_widget_override_background_color (widget, GTK_STATE_FLAG_NORMAL, !gateway_valid ? &rgba : NULL);
if (!gateway_valid) {
g_set_error (error,
- OPENVPN_EDITOR_PLUGIN_ERROR,
- OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
+ NMV_EDITOR_PLUGIN_ERROR,
+ NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY,
NM_OPENVPN_KEY_REMOTE);
return FALSE;
}
@@ -497,7 +497,7 @@ openvpn_editor_new (NMConnection *connection, GError **error)
object = g_object_new (OPENVPN_TYPE_EDITOR, NULL);
if (!object) {
- g_set_error_literal (error, OPENVPN_EDITOR_PLUGIN_ERROR, 0, _("could not create openvpn
object"));
+ g_set_error_literal (error, NMV_EDITOR_PLUGIN_ERROR, 0, _("could not create openvpn object"));
return NULL;
}
@@ -512,7 +512,7 @@ openvpn_editor_new (NMConnection *connection, GError **error)
g_warning ("Couldn't load builder file: %s",
error && *error ? (*error)->message : "(unknown)");
g_clear_error (error);
- g_set_error (error, OPENVPN_EDITOR_PLUGIN_ERROR, 0,
+ g_set_error (error, NMV_EDITOR_PLUGIN_ERROR, 0,
"could not load required resources from %s", ui_file);
g_free (ui_file);
g_object_unref (object);
@@ -523,7 +523,7 @@ openvpn_editor_new (NMConnection *connection, GError **error)
priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "openvpn-vbox"));
if (!priv->widget) {
- g_set_error_literal (error, OPENVPN_EDITOR_PLUGIN_ERROR, 0, _("could not load UI widget"));
+ g_set_error_literal (error, NMV_EDITOR_PLUGIN_ERROR, 0, _("could not load UI widget"));
g_object_unref (object);
return NULL;
}
diff --git a/shared/nm-default.h b/shared/nm-default.h
index d0dd8ab..4a85366 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -78,25 +78,25 @@
#define NM_SETTING_IP_CONFIG_METHOD NM_SETTING_IP4_CONFIG_METHOD
#define NMSettingIPConfig NMSettingIP4Config
-#define OPENVPN_EDITOR_PLUGIN_ERROR NM_SETTING_VPN_ERROR
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FAILED NM_SETTING_VPN_ERROR_UNKNOWN
-#define OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
-#define OPENVPN_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY NM_SETTING_VPN_ERROR_MISSING_PROPERTY
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN NM_SETTING_VPN_ERROR_UNKNOWN
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE NM_SETTING_VPN_ERROR_UNKNOWN
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_INVALID NM_SETTING_VPN_ERROR_UNKNOWN
+#define NMV_EDITOR_PLUGIN_ERROR NM_SETTING_VPN_ERROR
+#define NMV_EDITOR_PLUGIN_ERROR_FAILED NM_SETTING_VPN_ERROR_UNKNOWN
+#define NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
+#define NMV_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY NM_SETTING_VPN_ERROR_MISSING_PROPERTY
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN NM_SETTING_VPN_ERROR_UNKNOWN
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE NM_SETTING_VPN_ERROR_UNKNOWN
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_INVALID NM_SETTING_VPN_ERROR_UNKNOWN
#else /* !NM_VPN_OLD */
#include <NetworkManager.h>
-#define OPENVPN_EDITOR_PLUGIN_ERROR NM_CONNECTION_ERROR
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FAILED NM_CONNECTION_ERROR_FAILED
-#define OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
-#define OPENVPN_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY NM_CONNECTION_ERROR_MISSING_PROPERTY
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN NM_CONNECTION_ERROR_FAILED
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE NM_CONNECTION_ERROR_FAILED
-#define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_INVALID NM_CONNECTION_ERROR_FAILED
+#define NMV_EDITOR_PLUGIN_ERROR NM_CONNECTION_ERROR
+#define NMV_EDITOR_PLUGIN_ERROR_FAILED NM_CONNECTION_ERROR_FAILED
+#define NMV_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
+#define NMV_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY NM_CONNECTION_ERROR_MISSING_PROPERTY
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_OPENVPN NM_CONNECTION_ERROR_FAILED
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE NM_CONNECTION_ERROR_FAILED
+#define NMV_EDITOR_PLUGIN_ERROR_FILE_INVALID NM_CONNECTION_ERROR_FAILED
#endif /* NM_VPN_OLD */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
