|
 |
57bc60 |
From d5eaacc6ef749346cc83d6f142e28e0ae15a2623 Mon Sep 17 00:00:00 2001
|
|
|
57bc60 |
From: Bastien Nocera <hadess@hadess.net>
|
|
|
57bc60 |
Date: Tue, 20 Jun 2017 15:40:51 +0200
|
|
|
57bc60 |
Subject: [PATCH] network: Simplify the ignored Network interface types
|
|
|
57bc60 |
|
|
|
57bc60 |
We might want to add more ignored types later on, but this is a simple
|
|
|
57bc60 |
cleanup.
|
|
|
57bc60 |
|
|
|
57bc60 |
https://bugzilla.gnome.org/show_bug.cgi?id=783998
|
|
|
57bc60 |
---
|
|
|
57bc60 |
panels/network/cc-network-panel.c | 19 +++++++++++--------
|
|
|
57bc60 |
1 file changed, 11 insertions(+), 8 deletions(-)
|
|
|
57bc60 |
|
|
|
57bc60 |
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
|
|
|
57bc60 |
index 0a29c927f..5eca8429e 100644
|
|
|
57bc60 |
--- a/panels/network/cc-network-panel.c
|
|
|
57bc60 |
+++ b/panels/network/cc-network-panel.c
|
|
|
57bc60 |
@@ -696,19 +696,12 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
|
|
|
57bc60 |
if (find_in_model_by_id (panel, udi, NULL) != NULL)
|
|
|
57bc60 |
goto out;
|
|
|
57bc60 |
|
|
|
57bc60 |
- /* Don't add the libvirtd bridge to the UI */
|
|
|
57bc60 |
- if (g_strrstr (udi, "/virbr0") != NULL)
|
|
|
57bc60 |
- goto out;
|
|
|
57bc60 |
- /* Don't add VPN devices either */
|
|
|
57bc60 |
- if (g_strrstr (udi, "/tun0") != NULL)
|
|
|
57bc60 |
- goto out;
|
|
|
57bc60 |
-
|
|
|
57bc60 |
type = nm_device_get_device_type (device);
|
|
|
57bc60 |
|
|
|
57bc60 |
g_debug ("device %s type %i path %s",
|
|
|
57bc60 |
udi, type, nm_object_get_path (NM_OBJECT (device)));
|
|
|
57bc60 |
|
|
|
57bc60 |
- /* map the NMDeviceType to the GType */
|
|
|
57bc60 |
+ /* map the NMDeviceType to the GType, or ignore */
|
|
|
57bc60 |
switch (type) {
|
|
|
57bc60 |
case NM_DEVICE_TYPE_ETHERNET:
|
|
|
57bc60 |
device_g_type = NET_TYPE_DEVICE_ETHERNET;
|
|
|
57bc60 |
@@ -719,6 +712,16 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
|
|
|
57bc60 |
case NM_DEVICE_TYPE_WIFI:
|
|
|
57bc60 |
device_g_type = NET_TYPE_DEVICE_WIFI;
|
|
|
57bc60 |
break;
|
|
|
57bc60 |
+ /* not going to set up a cluster in GNOME */
|
|
|
57bc60 |
+ case NM_DEVICE_TYPE_VETH:
|
|
|
57bc60 |
+ /* enterprise features */
|
|
|
57bc60 |
+ case NM_DEVICE_TYPE_BOND:
|
|
|
57bc60 |
+ case NM_DEVICE_TYPE_TEAM:
|
|
|
57bc60 |
+ /* Don't need the libvirtd bridge */
|
|
|
57bc60 |
+ case NM_DEVICE_TYPE_BRIDGE:
|
|
|
57bc60 |
+ /* Don't add VPN devices */
|
|
|
57bc60 |
+ case NM_DEVICE_TYPE_TUN:
|
|
|
57bc60 |
+ goto out;
|
|
|
57bc60 |
default:
|
|
|
57bc60 |
device_g_type = NET_TYPE_DEVICE_SIMPLE;
|
|
|
57bc60 |
break;
|
|
|
57bc60 |
--
|
|
|
57bc60 |
2.13.0
|
|
|
57bc60 |
|