From 6a56ccf17847ed1b062e9a285934e93ea81873632235070cf1cdd8c8919bdfe3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 30 May 2018 13:33:23 +0000 Subject: [PATCH] Accepting request 612103 from home:JonathanKang:branches:GNOME:Factory - Add control-center-ignore-unmanaged-wifi-devices.patch: wifi: only manage Wi-Fi devices managed by NM (bsc#1079320). OBS-URL: https://build.opensuse.org/request/show/612103 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=388 --- ...center-ignore-unmanaged-wifi-devices.patch | 27 +++++++++++++++++++ gnome-control-center.changes | 6 +++++ gnome-control-center.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 control-center-ignore-unmanaged-wifi-devices.patch diff --git a/control-center-ignore-unmanaged-wifi-devices.patch b/control-center-ignore-unmanaged-wifi-devices.patch new file mode 100644 index 0000000..da685c3 --- /dev/null +++ b/control-center-ignore-unmanaged-wifi-devices.patch @@ -0,0 +1,27 @@ +From cb760e77af0b566f6fcc96fe162a875403665877 Mon Sep 17 00:00:00 2001 +From: Jonathan Kang +Date: Mon, 21 May 2018 15:23:04 +0800 +Subject: [PATCH] wifi: only manage Wi-Fi devices managed by NM + +If a Wi-Fi device is unmanaged by NetworkManager, ignore it. +--- + panels/network/cc-wifi-panel.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c +index d785bad0d..8db43c349 100644 +--- a/panels/network/cc-wifi-panel.c ++++ b/panels/network/cc-wifi-panel.c +@@ -91,7 +91,8 @@ add_wifi_device (CcWifiPanel *self, + NetObject *net_device; + + /* Only manage Wi-Fi devices */ +- if (!NM_IS_DEVICE_WIFI (device)) ++ if (!NM_IS_DEVICE_WIFI (device) || ++ !nm_device_get_managed (device)) + return; + + /* Create the NetDevice */ +-- +2.17.0 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index f7e800f..ab59436 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -10,6 +10,12 @@ Tue May 29 20:18:34 UTC 2018 - bjorn.lie@gmail.com - Fix wrong enterprise user/password hint. + Updated translations. +------------------------------------------------------------------- +Fri May 25 00:25:57 UTC 2018 - sckang@suse.com + +- Add control-center-ignore-unmanaged-wifi-devices.patch: + wifi: only manage Wi-Fi devices managed by NM (bsc#1079320). + ------------------------------------------------------------------- Tue May 8 10:21:28 UTC 2018 - qkzhu@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 3acacee..812541f 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -38,6 +38,8 @@ Source: http://download.gnome.org/sources/gnome-control-center/3.28/%{na Patch0: gnome-control-center-disable-error-message-for-NM.patch # PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch bgo#787882 bsc#1047509 sckang@suse.com -- wifi: Add domain-suffix-match entry Patch1: control-center-network-add-domain-suffix-match.patch +# PATCH-FIX-OPENSUSE control-center-ignore-unmanaged-wifi-devices.patch bsc#1079320 sckang@suse.com -- wifi: only manage Wi-Fi devices managed by NM +Patch2: control-center-ignore-unmanaged-wifi-devices.patch ### patches for Leap >= 15 plus SLE >= 15, but not TW # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. Patch1001: gnome-control-center-info-never-use-gnome-software.patch @@ -179,6 +181,7 @@ GNOME control center. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 translation-update-upstream # patches for Leap >= 15 plus SLE >= 15, but not TW