summaryrefslogtreecommitdiff
path: root/src/vpn-manager/nm-vpn-manager.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-16 16:51:22 -0400
committerDan Winship <danw@gnome.org>2014-10-22 08:29:10 -0400
commitda8d79f1c5f7d9c34610ebf82fe2328678cb4169 (patch)
tree72c920d7732692287779e7c499975fcc16f8e835 /src/vpn-manager/nm-vpn-manager.h
parent388a0c5e784b4babd80b57f8a66250bd3db37262 (diff)
downloadNetworkManager-da8d79f1c5f7d9c34610ebf82fe2328678cb4169.tar.gz
core: drop all remaining core-internal error domains
A number of classes in core had their own error domains that aren't really necessary. In the case of NMDcbError, NMDhcpManagerError, NMDnsManagerError, NMDnsmasqManagerError, NMPppManagerError, and NMSessionMonitorError, most of the codes they defined weren't even being used, and at any rate, the errors were always returned into contexts where they would just have their message extracted and then get thrown away without anyone ever looking at the domain or code. So all uses of those domains can just be replaced with NM_MANAGER_ERROR_FAILED without any loss of information. NMAuthManagerError only had 1 error code, and it just indicated "something went wrong", so it can be replaced with NM_MANAGER_ERROR_FAILED without loss of information. (nm-auth-manager.c has also been fixed to return NM_MANAGER_ERROR_FAILED when the CheckAuthorization D-Bus call fails, rather than returning whatever error domain/code the D-Bus call returned.) NMVpnManagerError used 2 of its 4 error codes, and they could actually end up getting returned across D-Bus in some cases. But there are NMManagerError codes that are semantically similar enough to make the NMVpnManagerError ones unnecessary.
Diffstat (limited to 'src/vpn-manager/nm-vpn-manager.h')
-rw-r--r--src/vpn-manager/nm-vpn-manager.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h
index bb272be9a6..b75a617955 100644
--- a/src/vpn-manager/nm-vpn-manager.h
+++ b/src/vpn-manager/nm-vpn-manager.h
@@ -33,20 +33,6 @@
#define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_MANAGER))
#define NM_VPN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_MANAGER, NMVpnManagerClass))
-typedef enum
-{
- NM_VPN_MANAGER_ERROR_DEVICE_NOT_ACTIVE = 0, /*< nick=BaseDeviceNotActive >*/
- NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/
- NM_VPN_MANAGER_ERROR_SERVICE_INVALID, /*< nick=ServiceInvalid >*/
- NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, /*< nick=ServiceStartFailed >*/
-} NMVpnManagerError;
-
-#define NM_VPN_MANAGER_ERROR (nm_vpn_manager_error_quark ())
-
-GQuark nm_vpn_manager_error_quark (void);
-GType nm_vpn_manager_error_get_type (void);
-
-
typedef struct {
GObject parent;
} NMVpnManager;