NetworkManager r2874 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: 2007-09-25 08:06:28 +0100 (Tue, 25 Sep 2007)
New Revision: 2874
ViewCVS link: http://svn.gnome.org/viewcvs/NetworkManager?rev=2874&view=rev

Modified:
   trunk/ChangeLog
   trunk/src/nm-activation-request.c
   trunk/src/nm-manager.c
   trunk/src/nm-manager.h
Log:
2007-09-25  Dan Williams  <dcbw redhat com>

	Ensure that old activation requests are forgotten about; previously
	hitting Cancel in the password dialog would deactivate whatever device
	that password was requested for, even if that wasn't the currently
	activating connection.

	* src/nm-manager.c
	  src/nm-manager.h
		- (nm_manager_get_connection_secrets): track the pending call
			object so it can be canceled later if needed
		- (nm_manager_cancel_get_connection_secrets): cancel a pending
			GetSecrets call for a particular connection

	* src/nm-activation-request.c
		- (dispose): cancel any outstanding GetSecrets calls on the
			connection