fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 02:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* src/vpn-manager/nm-vpn-connection.c
		- (device_state_changed): send correct state on device failure too
		- (plugin_state_changed): failed state means unexpected disconnection,
			thus if the service goes away while the VPN connection is activated
			that's a failure too



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3520 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-31 14:50:18 +00:00
parent bbc3153e8f
commit db81b8a279
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-03-31 Dan Williams <dcbw@redhat.com>
* src/vpn-manager/nm-vpn-connection.c
- (device_state_changed): send correct state on device failure too
- (plugin_state_changed): failed state means unexpected disconnection,
thus if the service goes away while the VPN connection is activated
that's a failure too
2008-03-31 Dan Williams <dcbw@redhat.com> 2008-03-31 Dan Williams <dcbw@redhat.com>
* src/vpn-manager/nm-vpn-manager.c * src/vpn-manager/nm-vpn-manager.c

10
src/vpn-manager/nm-vpn-connection.c
View file

@ -122,6 +122,10 @@ device_state_changed (NMDevice *device, NMDeviceState state, gpointer user_data)
nm_vpn_connection_set_state (connection, nm_vpn_connection_set_state (connection,
NM_VPN_CONNECTION_STATE_DISCONNECTED, NM_VPN_CONNECTION_STATE_DISCONNECTED,
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED); NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED);
} else if (state == NM_DEVICE_STATE_FAILED) {
nm_vpn_connection_set_state (connection,
NM_VPN_CONNECTION_STATE_FAILED,
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED);
} }
} }
@ -191,13 +195,9 @@ plugin_state_changed (DBusGProxy *proxy,
case NM_VPN_CONNECTION_STATE_NEED_AUTH: case NM_VPN_CONNECTION_STATE_NEED_AUTH:
case NM_VPN_CONNECTION_STATE_CONNECT: case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
nm_vpn_connection_set_state (connection,
NM_VPN_CONNECTION_STATE_FAILED,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED);
break;
case NM_VPN_CONNECTION_STATE_ACTIVATED: case NM_VPN_CONNECTION_STATE_ACTIVATED:
nm_vpn_connection_set_state (connection, nm_vpn_connection_set_state (connection,
NM_VPN_CONNECTION_STATE_DISCONNECTED, NM_VPN_CONNECTION_STATE_FAILED,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED); NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED);
break; break;
default: default: