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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2874 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-25 07:06:28 +00:00
parent 2366b6c346
commit 6e1c10d31b
4 changed files with 65 additions and 9 deletions

View File

@@ -98,8 +98,14 @@ dispose (GObject *object)
priv->secrets_updated_id = 0;
}
if (priv->connection)
if (priv->connection) {
NMManager *manager = nm_manager_get ();
nm_manager_cancel_get_connection_secrets (manager, priv->connection);
g_object_unref (manager);
g_object_unref (priv->connection);
}
}
static void