Noticed by Bill Moss <bmoss@clemson.edu>
	* src/NetworkManagerDbus.c
		- (nm_dbus_get_user_key_for_network_cb): deactivate the device
			instead of just cancelling its activation

	* src/NetworkManagerDevice.c
		- (nm_device_deactivate): some small cleanups
		- (nm_device_set_user_key_for_network): deactivate the device
			instead of just cancelling its activation


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