[gnome-control-center] network: Remove team support
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Remove team support
- Date: Thu, 26 May 2016 12:53:00 +0000 (UTC)
commit 99743428656618b64e5115e2216339676c0e7510
Author: Bastien Nocera <hadess hadess net>
Date: Fri Apr 29 13:54:16 2016 +0200
network: Remove team support
It will be supported by Cockpit in the near future:
https://github.com/cockpit-project/cockpit/issues/4330
https://bugzilla.gnome.org/show_bug.cgi?id=747443
panels/network/Makefile.am | 8 +-
.../connection-editor/net-connection-editor.c | 3 -
panels/network/net-device-team.c | 190 --------------------
panels/network/net-device-team.h | 58 ------
po/POTFILES.in | 1 -
5 files changed, 1 insertions(+), 259 deletions(-)
---
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index 2dce898..02a1017 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -43,12 +43,6 @@ libnetwork_la_SOURCES = \
cc-network-panel.c \
cc-network-panel.h
-TEAM_FILES = net-device-team.c net-device-team.h
-EXTRA_DIST = $(TEAM_FILES)
-if HAVE_NM_UNSTABLE
-libnetwork_la_SOURCES += $(TEAM_FILES)
-endif
-
libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS)
$(builddir)/connection-editor/libconnection-editor.la
libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
@@ -66,6 +60,6 @@ desktop_in_files = gnome-network-panel.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST += $(resource_files) network.gresource.xml
+EXTRA_DIST = $(resource_files) network.gresource.xml
-include $(top_srcdir)/git.mk
diff --git a/panels/network/connection-editor/net-connection-editor.c
b/panels/network/connection-editor/net-connection-editor.c
index ae466ab..1cb36d1 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -581,9 +581,6 @@ typedef struct {
static const NetConnectionType connection_types[] = {
{ N_("VPN"), nm_setting_vpn_get_type },
-#ifdef HAVE_NM_UNSTABLE
- { N_("Team"), nm_setting_team_get_type },
-#endif /* NM_UNSTABLE */
{ N_("VLAN"), nm_setting_vlan_get_type }
};
static const NetConnectionType *vpn_connection_type = &connection_types[0];
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 167e710..c287f98 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -78,7 +78,6 @@ panels/network/connection-editor/vpn-helpers.c
panels/network/gnome-network-panel.desktop.in.in
panels/network/net-device-ethernet.c
panels/network/net-device-mobile.c
-panels/network/net-device-team.c
panels/network/net-device-wifi.c
panels/network/net-proxy.c
panels/network/net-virtual-device.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]