2005-09-04 Dan Williams <dcbw@redhat.com>

Patch from Bill Nottingham <notting@redhat.com>
	* src/NetworkManagerDevice.c
		- (nm_device_activation_cancel): reset the quit_activation flag


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@935 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-09-04 17:02:41 +00:00
parent 2bc60a447d
commit 722918d789
2 changed files with 7 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2005-09-04 Dan Williams <dcbw@redhat.com>
Patch from Bill Nottingham <notting@redhat.com>
* src/NetworkManagerDevice.c
- (nm_device_activation_cancel): reset the quit_activation flag
2005-09-04 Dan Williams <dcbw@redhat.com>
* src/nm-activation-request.c

View file

@ -3159,6 +3159,7 @@ void nm_device_activation_cancel (NMDevice *dev)
nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, G_USEC_PER_SEC / 20, nm_ac_test, NULL, args);
nm_info ("Activation (%s): cancelled.", nm_device_get_iface(dev));
nm_schedule_state_change_signal_broadcast (dev->app_data);
dev->quit_activation = FALSE;
}
}