pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 686866 from home:JonathanKang:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Bjørn Lie 2019-03-22 16:51:49 +00:00 committed by Git OBS Bridge
parent 5d16fe3de4
commit e0b1b5d74b
3 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnome-control-center-disable-error-message-for-NM.patch
View File

@ -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.30.3.orig/panels/network/cc-network-panel.c
+++ 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/panels/network/cc-network-panel.c
@@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN @@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label; GtkWidget *label;
gchar *markup; gchar *markup;
@ -56,15 +56,17 @@ Index: gnome-control-center-3.29.4/panels/network/cc-network-panel.c
} }
static void 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.30.3.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c 2018-07-24 12:14:46.101326416 +0200 +++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.c
@@ -183,17 +183,36 @@ static void @@ -183,21 +183,41 @@ static void
check_main_stack_page (CcWifiPanel *self) check_main_stack_page (CcWifiPanel *self)
{ {
const gchar *nm_version; const gchar *nm_version;
+ const gchar *state; + const gchar *state;
gboolean airplane_mode_active;
gboolean wireless_enabled;
+ GDBusConnection *connection; + GDBusConnection *connection;
+ GDBusProxy *proxy; + GDBusProxy *proxy;
+ GVariant *variant; + GVariant *variant;
@ -80,29 +82,32 @@ Index: gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c
+ state = g_variant_get_string (variant, NULL); + state = g_variant_get_string (variant, NULL);
nm_version = nm_client_get_version (self->client); 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)
+ if (!nm_version && g_strcmp0 (state, "inactive") == 0) + if (!nm_version && g_strcmp0 (state, "inactive") == 0)
gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running"); gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running");
+ else if (g_strcmp0 (state, "active") == 0) + else if (g_strcmp0 (state, "active") == 0)
+ gtk_stack_set_visible_child_name (self->main_stack, "wicked-running"); + gtk_stack_set_visible_child_name (self->main_stack, "wicked-running");
else if (self->devices->len == 0 || else if (!wireless_enabled && airplane_mode_active)
!nm_client_wireless_get_enabled (self->client)) 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"); gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices");
else else
gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections"); gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections");
+
+ g_object_unref (connection); + g_object_unref (connection);
+ g_object_unref (proxy); + g_object_unref (proxy);
+ g_variant_unref (variant); + g_variant_unref (variant);
} }
static void 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.30.3.orig/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-3.29.4/panels/network/wifi.ui 2018-07-24 12:14:46.041325672 +0200 +++ gnome-control-center-3.30.3/panels/network/cc-wifi-panel.ui
@@ -293,6 +293,48 @@ @@ -331,6 +331,48 @@
<property name="name">nm-not-running</property> <property name="name">nm-not-running</property>
</packing> </packing>
</child> </child>
@ -150,4 +155,4 @@ Index: gnome-control-center-3.29.4/panels/network/wifi.ui
+ </child> + </child>
</object> </object>
</child> </child>
</template>

6
gnome-control-center.changes
View File

@ -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 <bjorn.lie@gmail.com> Mon Mar 18 09:55:17 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

6
gnome-control-center.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 URL: https://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz 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 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 # 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 Patch1: control-center-network-add-domain-suffix-match.patch
@ -190,7 +190,7 @@ GNOME control center.
%prep %prep
%setup -q %setup -q
#patch0 -p1 patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1