2008-03-31 Dan Williams <dcbw@redhat.com>

* 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
This commit is contained in:
Dan Williams 2008-03-31 14:48:39 +00:00
parent 59731b9cbd
commit bbc3153e8f
3 changed files with 25 additions and 12 deletions

View file

@ -1,3 +1,9 @@
2008-03-31 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* libnm-glib/nm-client.c

View file

@ -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);

View file

@ -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;