colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-10-29 Tambet Ingo <tambet@gmail.com>

Browse Source 
Half of it by Dan Williams <dcbw@redhat.com>

	* libnm-util/libnm-util.ver
	libnm-util/nm-setting-vpn.c
	libnm-util/nm-setting-vpn.h
		- Make properties private and add accessor functions.

	* src/vpn-manager/nm-vpn-connection.c
	src/vpn-manager/nm-vpn-manager.c
	system-settings/plugins/keyfile/reader.c
	vpn-daemons/openvpn/properties/auth-helpers.c
	vpn-daemons/openvpn/properties/import-export.c
	vpn-daemons/openvpn/properties/nm-openvpn.c
	vpn-daemons/openvpn/src/nm-openvpn-service.c
	vpn-daemons/pptp/auth-dialog/main.c
	vpn-daemons/pptp/properties/advanced-dialog.c
	vpn-daemons/pptp/properties/nm-pptp.c
	vpn-daemons/pptp/src/nm-pptp-service.c
	vpn-daemons/vpnc/properties/nm-vpnc.c
	vpn-daemons/vpnc/src/nm-vpnc-service.c
		- Use VPN setting accessors.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4232 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-10-29 09:13:40 +00:00
parent 69713a8b93
commit 8f6eb995f9
17 changed files with 640 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vpn-manager/nm-vpn-connection.c
View File

@@ -224,14 +224,14 @@ nm_vpn_connection_new (NMConnection *connection,
return vpn_connection;
}
static char *
static const char *
nm_vpn_connection_get_service (NMVPNConnection *connection)
{
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
NMSettingVPN *setting;
setting = (NMSettingVPN *) nm_connection_get_setting (priv->connection, NM_TYPE_SETTING_VPN);
return setting->service_type;
return nm_setting_vpn_get_service_type (setting);
}
static void

6
src/vpn-manager/nm-vpn-manager.c
View File

@@ -152,6 +152,7 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
NMVPNService *service;
char *path = NULL;
NMVPNConnection *vpn;
const char *service_type;
g_return_val_if_fail (NM_IS_VPN_MANAGER (manager), NULL);
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
@@ -181,9 +182,10 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager,
vpn = NULL;
}
service = nm_vpn_manager_get_service (manager, vpn_setting->service_type);
service_type = nm_setting_vpn_get_service_type (vpn_setting);
service = nm_vpn_manager_get_service (manager, service_type);
if (!service) {
service = nm_vpn_service_new (vpn_setting->service_type);
service = nm_vpn_service_new (service_type);
if (service)
nm_vpn_manager_add_service (manager, service);
}