From c3e71b49277e1e12bccd65b8575aa847862e6868 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 7 Aug 2012 10:19:18 -0400 Subject: [PATCH] network: Don't show shared connections in the wifi list A shared connection is the leftover of an inactive hotspot. We don't want to show these in the list. --- panels/network/net-device-wifi.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c index 0c4cf2c9d..c933b27be 100644 --- a/panels/network/net-device-wifi.c +++ b/panels/network/net-device-wifi.c @@ -381,16 +381,9 @@ find_connection_for_device (NetDeviceWifi *device_wifi, } static gboolean -device_is_hotspot (NetDeviceWifi *device_wifi) +connection_is_shared (NMConnection *c) { - NMConnection *c; NMSettingIP4Config *s_ip4; - NMDevice *device; - - device = net_device_get_nm_device (NET_DEVICE (device_wifi)); - c = find_connection_for_device (device_wifi, device); - if (c == NULL) - return FALSE; s_ip4 = nm_connection_get_setting_ip4_config (c); if (g_strcmp0 (nm_setting_ip4_config_get_method (s_ip4), @@ -401,6 +394,20 @@ device_is_hotspot (NetDeviceWifi *device_wifi) return TRUE; } +static gboolean +device_is_hotspot (NetDeviceWifi *device_wifi) +{ + NMConnection *c; + NMDevice *device; + + device = net_device_get_nm_device (NET_DEVICE (device_wifi)); + c = find_connection_for_device (device_wifi, device); + if (c == NULL) + return FALSE; + + return connection_is_shared (c); +} + static const GByteArray * device_get_hotspot_ssid (NetDeviceWifi *device_wifi, NMDevice *device) @@ -610,7 +617,8 @@ device_wifi_refresh_saved_connections (NetDeviceWifi *device_wifi) filtered = nm_device_filter_connections (nm_device, connections); for (l = filtered; l; l = l->next) { NMConnection *connection = l->data; - add_saved_connection (device_wifi, connection, nm_device); + if (!connection_is_shared (connection)) + add_saved_connection (device_wifi, connection, nm_device); } device_wifi->priv->updating_device = FALSE;