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



commit b38bf8b67207b55df9d9c1f9433699c5b0395c89
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Apr 29 13:52:45 2016 +0200

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

 panels/network/Makefile.am                         |    2 -
 panels/network/cc-network-panel.c                  |   11 +-
 .../connection-editor/net-connection-editor.c      |    1 -
 panels/network/gnome-network-panel.desktop.in.in   |    2 +-
 panels/network/net-device-bond.c                   |  190 --------------------
 panels/network/net-device-bond.h                   |   58 ------
 po/POTFILES.in                                     |    1 -
 7 files changed, 2 insertions(+), 263 deletions(-)
---
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index ce2a2d0..2dce898 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -32,8 +32,6 @@ libnetwork_la_SOURCES =                                       \
        net-device-ethernet.h                           \
        net-device-mobile.c                             \
        net-device-mobile.h                             \
-       net-device-bond.c                               \
-       net-device-bond.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 1ecf8e6..f83cf5d 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -36,7 +36,6 @@
 #include "net-device-mobile.h"
 #include "net-device-wifi.h"
 #include "net-device-ethernet.h"
-#include "net-device-bond.h"
 #include "net-object.h"
 #include "net-proxy.h"
 #include "net-virtual-device.h"
@@ -727,7 +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_BOND:
         case NM_DEVICE_TYPE_VLAN:
                 goto out;
         default:
@@ -1163,8 +1161,6 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection)
         const gchar *id;
         GtkNotebook *notebook;
         GtkSizeGroup *size_group;
-        NMSettingConnection *s_con;
-        const gchar *connection_type;
         GType device_g_type;
 
         /* does already exist */
@@ -1173,12 +1169,7 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection)
                 return;
 
         /* map the NMConnection to a NetDevice GType */
-        s_con = nm_connection_get_setting_connection (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
-                device_g_type = NET_TYPE_VIRTUAL_DEVICE;
+        device_g_type = NET_TYPE_VIRTUAL_DEVICE;
 
         /* add as a virtual object */
         net_virt = g_object_new (device_g_type,
diff --git a/panels/network/connection-editor/net-connection-editor.c 
b/panels/network/connection-editor/net-connection-editor.c
index 91a1563..ae466ab 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_("Bond"), nm_setting_bond_get_type },
 #ifdef HAVE_NM_UNSTABLE
         { N_("Team"), nm_setting_team_get_type },
 #endif /* NM_UNSTABLE */
diff --git a/panels/network/gnome-network-panel.desktop.in.in 
b/panels/network/gnome-network-panel.desktop.in.in
index d3cb392..e4ab2b1 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;bond;DNS;
+_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;DNS;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 713ab39..167e710 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -76,7 +76,6 @@ panels/network/connection-editor/vpn-helpers.c
 [type: gettext/glade]panels/network/connection-editor/vpn-page.ui
 [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-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]