fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 18:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-11-15 Dan Williams <dcbw@redhat.com>

Browse source 
* properties/nm-vpnc.c
		- Fixup for NMSettingConnection 'name' -> 'id' changes



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3094 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-11-15 21:31:22 +00:00
parent 3408252251
commit f7ebfe5640
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vpn-daemons/openvpn/ChangeLog
View file

@ -1,3 +1,8 @@
2007-11-15 Dan Williams <dcbw@redhat.com>
* properties/nm-vpnc.c
- Fixup for NMSettingConnection 'name' -> 'id' changes
2007-11-07 Dan Williams <dcbw@redhat.com>
* properties/nm-openvpn.c

18
vpn-daemons/openvpn/properties/nm-openvpn.c
View file

@ -244,7 +244,7 @@ impl_fill_connection (NetworkManagerVpnUI *self, NMConnection *connection)
NMSettingVPN *s_vpn;
NMSettingVPNProperties *s_vpn_props;
GHashTable *properties;
const char *connectionname;
const char *connection_id;
const char *remote;
const char *port;
const char *ca;
@ -271,9 +271,9 @@ impl_fill_connection (NetworkManagerVpnUI *self, NMConnection *connection)
properties = s_vpn_props->data;
/* Connection name */
connectionname = gtk_entry_get_text (impl->w_connection_name);
g_assert (connectionname);
s_con->name = g_strdup (connectionname);
connection_id = gtk_entry_get_text (impl->w_connection_name);
g_assert (connection_id);
s_con->id = g_strdup (connection_id);
/* Populate routes */
if (s_vpn->routes) {
@ -430,8 +430,8 @@ impl_get_widget (NetworkManagerVpnUI *self, NMConnection *connection)
/* Populate UI bits from the NMConnection */
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
g_assert (s_con);
g_assert (s_con->name);
gtk_entry_set_text (impl->w_connection_name, s_con->name);
g_assert (s_con->id);
gtk_entry_set_text (impl->w_connection_name, s_con->id);
s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN));
g_assert (s_vpn);
@ -1481,7 +1481,7 @@ export_to_file (NetworkManagerVpnUIImpl *impl,
"ta=%s\n"
"ta_dir=%s\n"
"routes=%s\n",
/* Description */ s_con->name,
/* Description */ s_con->id,
/* conn type */ connection_type,
/* Host */ remote,
/* Port */ port,
@ -1531,9 +1531,9 @@ impl_export (NetworkManagerVpnUI *self, NMConnection *connection)
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
g_assert (s_con);
g_assert (s_con->name);
g_assert (s_con->id);
suggested_name = g_strdup_printf ("%s.pcf", s_con->name);
suggested_name = g_strdup_printf ("%s.pcf", s_con->id);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_name);
g_free (suggested_name);