NetworkManager r3084 - in trunk: . libnm-util src src/vpn-manager

[dcbw svn gnome org]

Author: dcbw
Date: 2007-11-15 15:52:42 +0000 (Thu, 15 Nov 2007)
New Revision: 3084
ViewCVS link: http://svn.gnome.org/viewcvs/NetworkManager?rev=3084&view=rev

Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-connection.c
   trunk/libnm-util/nm-setting-connection.h
   trunk/libnm-util/nm-setting.c
   trunk/src/NetworkManagerPolicy.c
   trunk/src/nm-device-802-11-wireless.c
   trunk/src/vpn-manager/nm-vpn-connection.c
Log:
2007-11-15  Dan Williams  <dcbw redhat com>

	* libnm-util/nm-setting-connection.h
	  libnm-util/nm-setting-connection.c
		- Rename the 'name' property to 'id', because it conflicted with the
			NMSetting superclass' 'name' property.

	* libnm-util/nm-setting.c
		- (nm_setting_to_hash): serialize the 'name' property
		- (one_property_cb): ignore 'name' on deserialization of a connection

	* src/nm-device-802-11-wireless.c
	  src/vpn-manager/nm-vpn-connection.c
	  src/NetworkManagerPolicy.c
		- Fix up for NMSettingConnection 'name'->'id' changes