[gnome-control-center] network: Clarify the VPN service type setting
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Clarify the VPN service type setting
- Date: Fri, 26 Aug 2011 12:32:43 +0000 (UTC)
commit 760522d02c41f451a0eb7e26c0b0165e0e1be8db
Author: Bastien Nocera <hadess hadess net>
Date: Fri Aug 26 13:30:28 2011 +0100
network: Clarify the VPN service type setting
https://bugzilla.gnome.org/show_bug.cgi?id=657303#c8
panels/network/net-vpn.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index 5315d38..5b27de1 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -62,11 +62,21 @@ connection_removed_cb (NMConnection *connection,
net_object_emit_removed (NET_OBJECT (vpn));
}
+static char *
+net_vpn_connection_to_type (NMConnection *connection)
+{
+ const gchar *type, *p;
+
+ type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection));
+ /* Go from "org.freedesktop.NetworkManager.vpnc" to "vpnc" for example */
+ p = strrchr (type, '.');
+ return g_strdup (p ? p + 1 : type);
+}
+
void
net_vpn_set_connection (NetVpn *vpn, NMConnection *connection)
{
NetVpnPrivate *priv = vpn->priv;
- const gchar *type, *p;
/*
* vpnc config exmaple:
* key=IKE DH Group, value=dh2
@@ -93,9 +103,7 @@ net_vpn_set_connection (NetVpn *vpn, NMConnection *connection)
vpn);
}
- type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (priv->connection));
- p = strrchr (type, '.');
- priv->service_type = g_strdup (p ? p + 1 : type);
+ priv->service_type = net_vpn_connection_to_type (priv->connection);
}
NMConnection *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]