From bbc3153e8f649687a6146e4545ab5d9709b34e9a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 31 Mar 2008 14:48:39 +0000 Subject: [PATCH] 2008-03-31 Dan Williams * src/vpn-manager/nm-vpn-manager.c src/vpn-manager/nm-vpn-manager.h - Make VPNManager errors more available; add a service-start-failed error git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3519 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/vpn-manager/nm-vpn-manager.c | 16 ++++------------ src/vpn-manager/nm-vpn-manager.h | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f846231caf..4ad0b60455 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-31 Dan Williams + + * src/vpn-manager/nm-vpn-manager.c + src/vpn-manager/nm-vpn-manager.h + - Make VPNManager errors more available; add a service-start-failed error + 2008-03-31 Dan Williams * libnm-glib/nm-client.c diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index e3b5fa64b7..284a4e941c 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -27,17 +27,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -typedef enum -{ - NM_VPN_MANAGER_ERROR_DEVICE_NOT_ACTIVE = 0, - NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, - NM_VPN_MANAGER_ERROR_SERVICE_INVALID, -} NMVPNManagerError; - -#define NM_VPN_MANAGER_ERROR (nm_vpn_manager_error_quark ()) -#define NM_TYPE_VPN_MANAGER_ERROR (nm_vpn_manager_error_get_type ()) - -static GQuark +GQuark nm_vpn_manager_error_quark (void) { static GQuark quark = 0; @@ -49,7 +39,7 @@ nm_vpn_manager_error_quark (void) /* This should really be standard. */ #define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } -static GType +GType nm_vpn_manager_error_get_type (void) { static GType etype = 0; @@ -62,6 +52,8 @@ nm_vpn_manager_error_get_type (void) ENUM_ENTRY (NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, "ConnectionInvalid"), /* The VPN service required by this VPN connection did not exist or was invalid. */ ENUM_ENTRY (NM_VPN_MANAGER_ERROR_SERVICE_INVALID, "ServiceInvalid"), + /* The VPN service required by this VPN connection could not be started. */ + ENUM_ENTRY (NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, "ServiceStartFailed"), { 0, 0, 0 } }; etype = g_enum_register_static ("NMVPNManagerError", values); diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 3d064b2dd6..c4bb605e71 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -15,6 +15,21 @@ #define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), 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, + NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, + NM_VPN_MANAGER_ERROR_SERVICE_INVALID, + NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, +} NMVPNManagerError; + +#define NM_VPN_MANAGER_ERROR (nm_vpn_manager_error_quark ()) +#define NM_TYPE_VPN_MANAGER_ERROR (nm_vpn_manager_error_get_type ()) + +GQuark nm_vpn_manager_error_quark (void); +GType nm_vpn_manager_error_get_type (void); + + typedef struct { GObject parent; } NMVPNManager;