[gnome-control-center] network: Remove bridge support
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Remove bridge support
- Date: Thu, 26 May 2016 12:52:50 +0000 (UTC)
commit 20b634b4544d1cfa62cf37932b20396198fd84d9
Author: Bastien Nocera <hadess hadess net>
Date: Fri Apr 29 13:50:41 2016 +0200
network: Remove bridge support
It is supported by Cockpit already:
https://github.com/cockpit-project/cockpit/issues/459
https://bugzilla.gnome.org/show_bug.cgi?id=747443
panels/network/Makefile.am | 2 -
panels/network/cc-network-panel.c | 4 -
.../connection-editor/net-connection-editor.c | 1 -
panels/network/gnome-network-panel.desktop.in.in | 2 +-
panels/network/net-device-bridge.c | 190 --------------------
panels/network/net-device-bridge.h | 58 ------
po/POTFILES.in | 1 -
7 files changed, 1 insertions(+), 257 deletions(-)
---
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index f78395d..ce2a2d0 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -34,8 +34,6 @@ libnetwork_la_SOURCES = \
net-device-mobile.h \
net-device-bond.c \
net-device-bond.h \
- net-device-bridge.c \
- net-device-bridge.h \
net-virtual-device.c \
net-virtual-device.h \
net-vpn.c \
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 306a371..1ecf8e6 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -37,7 +37,6 @@
#include "net-device-wifi.h"
#include "net-device-ethernet.h"
#include "net-device-bond.h"
-#include "net-device-bridge.h"
#include "net-object.h"
#include "net-proxy.h"
#include "net-virtual-device.h"
@@ -729,7 +728,6 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
device_g_type = NET_TYPE_DEVICE_WIFI;
break;
case NM_DEVICE_TYPE_BOND:
- case NM_DEVICE_TYPE_BRIDGE:
case NM_DEVICE_TYPE_VLAN:
goto out;
default:
@@ -1179,8 +1177,6 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection)
connection_type = nm_setting_connection_get_connection_type (s_con);
if (!strcmp (connection_type, NM_SETTING_BOND_SETTING_NAME))
device_g_type = NET_TYPE_DEVICE_BOND;
- else if (!strcmp (connection_type, NM_SETTING_BRIDGE_SETTING_NAME))
- device_g_type = NET_TYPE_DEVICE_BRIDGE;
else
device_g_type = NET_TYPE_VIRTUAL_DEVICE;
diff --git a/panels/network/connection-editor/net-connection-editor.c
b/panels/network/connection-editor/net-connection-editor.c
index 047f7f2..91a1563 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -585,7 +585,6 @@ static const NetConnectionType connection_types[] = {
#ifdef HAVE_NM_UNSTABLE
{ N_("Team"), nm_setting_team_get_type },
#endif /* NM_UNSTABLE */
- { N_("Bridge"), nm_setting_bridge_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 52c6266..d3cb392 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;bridge;bond;DNS;
+_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;bond;DNS;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 35bd09d..713ab39 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,7 +77,6 @@ panels/network/connection-editor/vpn-helpers.c
[type: gettext/glade]panels/network/connection-editor/wifi-page.ui
panels/network/gnome-network-panel.desktop.in.in
panels/network/net-device-bond.c
-panels/network/net-device-bridge.c
panels/network/net-device-ethernet.c
panels/network/net-device-mobile.c
panels/network/net-device-team.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]