From e0b1b5d74bb6f2f682e1918c555cd133a66b180c6dbe0082485275233e157494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 22 Mar 2019 16:51:49 +0000 Subject: [PATCH] Accepting request 686866 from home:JonathanKang:branches:GNOME:Factory - Rebase gnome-control-center-disable-error-message-for-NM.patch (bsc#1128195). OBS-URL: https://build.opensuse.org/request/show/686866 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=409 --- ...-center-disable-error-message-for-NM.patch | 127 +++++++++--------- gnome-control-center.changes | 6 + gnome-control-center.spec | 6 +- 3 files changed, 75 insertions(+), 64 deletions(-) diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch index 12379ff..2f58109 100644 --- a/gnome-control-center-disable-error-message-for-NM.patch +++ b/gnome-control-center-disable-error-message-for-NM.patch @@ -1,7 +1,7 @@ -Index: gnome-control-center-3.29.4/panels/network/cc-network-panel.c +Index: gnome-control-center-3.30.3/panels/network/cc-network-panel.c =================================================================== ---- gnome-control-center-3.29.4.orig/panels/network/cc-network-panel.c 2018-07-17 02:32:35.000000000 +0200 -+++ gnome-control-center-3.29.4/panels/network/cc-network-panel.c 2018-07-24 12:14:46.041325672 +0200 +--- gnome-control-center-3.30.3.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.30.3/panels/network/cc-network-panel.c @@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN GtkWidget *label; gchar *markup; @@ -56,15 +56,17 @@ Index: gnome-control-center-3.29.4/panels/network/cc-network-panel.c } static void -Index: gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c +Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c =================================================================== ---- gnome-control-center-3.29.4.orig/panels/network/cc-wifi-panel.c 2018-07-17 02:32:35.000000000 +0200 -+++ gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c 2018-07-24 12:14:46.101326416 +0200 -@@ -183,17 +183,36 @@ static void +--- gnome-control-center-3.30.3.orig/panels/network/cc-wifi-panel.c ++++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c +@@ -183,21 +183,41 @@ static void check_main_stack_page (CcWifiPanel *self) { const gchar *nm_version; + const gchar *state; + gboolean airplane_mode_active; + gboolean wireless_enabled; + GDBusConnection *connection; + GDBusProxy *proxy; + GVariant *variant; @@ -80,74 +82,77 @@ Index: gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c + state = g_variant_get_string (variant, NULL); nm_version = nm_client_get_version (self->client); + wireless_enabled = nm_client_wireless_get_enabled (self->client); + airplane_mode_active = gtk_switch_get_active (self->rfkill_switch); - if (!nm_version) + if (!nm_version && g_strcmp0 (state, "inactive") == 0) gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running"); + else if (g_strcmp0 (state, "active") == 0) + gtk_stack_set_visible_child_name (self->main_stack, "wicked-running"); - else if (self->devices->len == 0 || - !nm_client_wireless_get_enabled (self->client)) + else if (!wireless_enabled && airplane_mode_active) + gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode"); + else if (!wireless_enabled || self->devices->len == 0) gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices"); else gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections"); - ++ + g_object_unref (connection); + g_object_unref (proxy); + g_variant_unref (variant); } static void -Index: gnome-control-center-3.29.4/panels/network/wifi.ui +Index: gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui =================================================================== ---- gnome-control-center-3.29.4.orig/panels/network/wifi.ui 2018-07-17 02:32:35.000000000 +0200 -+++ gnome-control-center-3.29.4/panels/network/wifi.ui 2018-07-24 12:14:46.041325672 +0200 -@@ -293,6 +293,48 @@ - nm-not-running - - +--- gnome-control-center-3.30.3.orig/panels/network/cc-wifi-panel.ui ++++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui +@@ -331,6 +331,48 @@ + nm-not-running + + + -+ -+ -+ -+ True -+ False -+ True -+ center -+ center -+ vertical -+ 18 -+ 18 -+ -+ -+ True -+ False -+ face-sad-symbolic -+ 128 -+ -+ -+ -+ -+ -+ True -+ False -+ True -+ Please use YaST2 to configure your network. -+ -+ -+ -+ -+ -+ end -+ -+ -+ -+ -+ wicked-running -+ -+ - - - ++ ++ ++ ++ True ++ False ++ True ++ center ++ center ++ vertical ++ 18 ++ 18 ++ ++ ++ True ++ False ++ face-sad-symbolic ++ 128 ++ ++ ++ ++ ++ ++ True ++ False ++ True ++ Please use YaST2 to configure your network. ++ ++ ++ ++ ++ ++ end ++ ++ ++ ++ ++ wicked-running ++ ++ + + + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 96dbc08..398632f 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 02:20:35 UTC 2019 - sckang@suse.com + +- Rebase gnome-control-center-disable-error-message-for-NM.patch + (bsc#1128195). + ------------------------------------------------------------------- Mon Mar 18 09:55:17 UTC 2019 - Bjørn Lie diff --git a/gnome-control-center.spec b/gnome-control-center.spec index d496f28..2e8ffa1 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,7 +34,7 @@ Group: System/GUI/GNOME URL: https://www.gnome.org Source: http://download.gnome.org/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz -# PATCH-NEEDS-REBASE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running WAS: PATCH-FIX-OPENSUSE +# PATCH-NEEDS-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running 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 @@ -190,7 +190,7 @@ GNOME control center. %prep %setup -q -#patch0 -p1 +patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1