2007-08-14 Dan Williams <dcbw@redhat.com>

	* include/NetworkManagerVPN.h
	  src/vpn-manager/nm-dbus-vpn.c
	  src/vpn-manager/nm-dbus-vpn.h
	  src/vpn-manager/nm-vpn-act-request.c
	  src/vpn-manager/nm-vpn-act-request.h
	  src/vpn-manager/nm-vpn-service.c
	  src/vpn-manager/nm-vpn-service.h
	  libnm-glib/nm-vpn-connection.c
	  libnm-glib/nm-vpn-connection.h
	  libnm-glib/nm-client.h
		- Rename NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> 
			NMVPNServiceState to clarify what they apply to
		- Rename NM_VPN_ACT_STAGE_* -> NM_VPN_CONNECTION_STATE_* and
			NMVPNActStage -> NMVPNConnectionState for the same reason

	* libnm-glib/nm-client.c
		- Constant + type renames from above
		- Properly handle NameOwnerChanged/manager_running signals
			for NM service; only emit when state really changes
		- Use hash tables correctly so that the key (which was previously owned
			by the D-Bus message) now has the same lifetime as the value, since
			the key is now taken from the the NMVPNConnection itself.  This
			really fixes the double-VPN names in the applet



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2677 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

1 files changed, 13 insertions, 13 deletions

diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
index b77152f8e0..1f6c10d70a 100644
--- a/libnm-glib/nm-vpn-connection.c
+++ b/libnm-glib/nm-vpn-connection.c
@@ -31,7 +31,7 @@ typedef struct {
 	char *name;
 	char *user_name;
 	char *service;
-	NMVPNActStage state;
+	NMVPNConnectionState state;
 } NMVPNConnectionPrivate;
 
 enum {
@@ -48,7 +48,7 @@ nm_vpn_connection_init (NMVPNConnection *connection)
 {
 	NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
 
-	priv->state = NM_VPN_ACT_STAGE_UNKNOWN;
+	priv->state = NM_VPN_CONNECTION_STATE_UNKNOWN;
 }
 
 static void
@@ -99,7 +99,7 @@ update_properties (NMVPNConnection *connection)
 	char *name = NULL;
 	char *user_name = NULL;
 	char *service = NULL;
-	NMVPNActStage state;
+	NMVPNConnectionState state;
 	GError *err = NULL;
 
 	priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
@@ -125,7 +125,7 @@ update_properties (NMVPNConnection *connection)
 	priv->user_name = user_name;
 	priv->service = service;
 	
-	nm_vpn_connection_set_state (connection, (NMVPNActStage) state);
+	nm_vpn_connection_set_state (connection, (NMVPNConnectionState) state);
 
 	return TRUE;
 }
@@ -192,16 +192,16 @@ nm_vpn_connection_get_service (NMVPNConnection *vpn)
 	return NM_VPN_CONNECTION_GET_PRIVATE (vpn)->service;
 }
 
-NMVPNActStage
+NMVPNConnectionState
 nm_vpn_connection_get_state (NMVPNConnection *vpn)
 {
-	g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NM_VPN_ACT_STAGE_UNKNOWN);
+	g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NM_VPN_CONNECTION_STATE_UNKNOWN);
 
 	return NM_VPN_CONNECTION_GET_PRIVATE (vpn)->state;
 }
 
 void
-nm_vpn_connection_set_state (NMVPNConnection *vpn, NMVPNActStage state)
+nm_vpn_connection_set_state (NMVPNConnection *vpn, NMVPNConnectionState state)
 {
 	NMVPNConnectionPrivate *priv;
 
@@ -217,14 +217,14 @@ nm_vpn_connection_set_state (NMVPNConnection *vpn, NMVPNActStage state)
 gboolean
 nm_vpn_connection_is_activating (NMVPNConnection *vpn)
 {
-	NMVPNActStage state;
+	NMVPNConnectionState state;
 
 	g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), FALSE);
 
 	state = nm_vpn_connection_get_state (vpn);
-	if (state == NM_VPN_ACT_STAGE_PREPARE ||
-		state == NM_VPN_ACT_STAGE_CONNECT ||
-		state == NM_VPN_ACT_STAGE_IP_CONFIG_GET)
+	if (state == NM_VPN_CONNECTION_STATE_PREPARE ||
+		state == NM_VPN_CONNECTION_STATE_CONNECT ||
+		state == NM_VPN_CONNECTION_STATE_IP_CONFIG_GET)
 		return TRUE;
 
 	return FALSE;
@@ -240,7 +240,7 @@ nm_vpn_connection_activate (NMVPNConnection *vpn, GSList *passwords)
 	g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), FALSE);
 	g_return_val_if_fail (passwords != NULL, FALSE);
 
-	if (nm_vpn_connection_get_state (vpn) != NM_VPN_ACT_STAGE_DISCONNECTED) {
+	if (nm_vpn_connection_get_state (vpn) != NM_VPN_CONNECTION_STATE_DISCONNECTED) {
 		g_warning ("VPN connection is already connected or connecting");
 		return FALSE;
 	}
@@ -269,7 +269,7 @@ nm_vpn_connection_deactivate (NMVPNConnection *vpn)
 {
 	g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), FALSE);
 
-	if (nm_vpn_connection_get_state (vpn) != NM_VPN_ACT_STAGE_ACTIVATED &&
+	if (nm_vpn_connection_get_state (vpn) != NM_VPN_CONNECTION_STATE_ACTIVATED &&
 		!nm_vpn_connection_is_activating (vpn)) {
 		g_warning ("VPN connection isn't activated");
 		return FALSE;