[gnome-control-center] network: Remove VLAN support



commit a4729411b564ae1e69522101984818a11ca94efe
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Apr 29 13:58:00 2016 +0200

    network: Remove VLAN support
    
    It is supported by Cockpit already:
    https://github.com/cockpit-project/cockpit/issues/1007
    
    https://bugzilla.gnome.org/show_bug.cgi?id=747443

 panels/network/cc-network-panel.c                  |    2 --
 .../connection-editor/net-connection-editor.c      |    1 -
 panels/network/gnome-network-panel.desktop.in.in   |    2 +-
 3 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index f83cf5d..17e3cbf 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -726,8 +726,6 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
         case NM_DEVICE_TYPE_WIFI:
                 device_g_type = NET_TYPE_DEVICE_WIFI;
                 break;
-        case NM_DEVICE_TYPE_VLAN:
-                goto out;
         default:
                 device_g_type = NET_TYPE_DEVICE_SIMPLE;
                 break;
diff --git a/panels/network/connection-editor/net-connection-editor.c 
b/panels/network/connection-editor/net-connection-editor.c
index 1cb36d1..0ea3486 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -581,7 +581,6 @@ typedef struct {
 
 static const NetConnectionType connection_types[] = {
         { N_("VPN"), nm_setting_vpn_get_type },
-        { N_("VLAN"), nm_setting_vlan_get_type }
 };
 static const NetConnectionType *vpn_connection_type = &connection_types[0];
 
diff --git a/panels/network/gnome-network-panel.desktop.in.in 
b/panels/network/gnome-network-panel.desktop.in.in
index e4ab2b1..d0817ab 100644
--- a/panels/network/gnome-network-panel.desktop.in.in
+++ b/panels/network/gnome-network-panel.desktop.in.in
@@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=network
 X-GNOME-Bugzilla-Version= VERSION@
 # Translators: those are keywords for the network control-center panel
-_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;DNS;
+_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]