NetworkManager r3519 - in trunk: . src/vpn-manager

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 15:48:39 2008
New Revision: 3519
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3519&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/src/vpn-manager/nm-vpn-manager.c
   trunk/src/vpn-manager/nm-vpn-manager.h

Modified: trunk/src/vpn-manager/nm-vpn-manager.c
==============================================================================
--- trunk/src/vpn-manager/nm-vpn-manager.c	(original)
+++ trunk/src/vpn-manager/nm-vpn-manager.c	Mon Mar 31 15:48:39 2008
@@ -27,17 +27,7 @@
 
 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 @@
 /* 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 @@
 			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);

Modified: trunk/src/vpn-manager/nm-vpn-manager.h
==============================================================================
--- trunk/src/vpn-manager/nm-vpn-manager.h	(original)
+++ trunk/src/vpn-manager/nm-vpn-manager.h	Mon Mar 31 15:48:39 2008
@@ -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;