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

Accepting request 701856 from GNOME:Factory

Browse Source 
- Modified gnome-control-center-disable-error-message-for-NM.patch:
  Only prompt users to use Yast to configure network when
  NetworkManager is not running (boo#1134381).

OBS-URL: https://build.opensuse.org/request/show/701856
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=178
This commit is contained in:
Dominique Leuenberger 2019-05-16 19:57:08 +00:00 committed by Git OBS Bridge
commit d6adceeed9
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
Index: gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c Index: gnome-control-center-3.32.1/panels/network/cc-network-panel.c
=================================================================== ===================================================================
--- gnome-control-center-3.32.0.1.orig/panels/network/cc-network-panel.c --- gnome-control-center-3.32.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c +++ gnome-control-center-3.32.1/panels/network/cc-network-panel.c
@@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN @@ -775,10 +775,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label; GtkWidget *label;
gchar *markup; gchar *markup;
const gchar *version; const gchar *version;
@ -28,11 +28,11 @@ Index: gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c
gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel))); gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@@ -795,9 +809,27 @@ panel_check_network_manager_version (CcN @@ -801,9 +815,27 @@ panel_check_network_manager_version (CcN
gtk_widget_show_all (box); gtk_widget_show_all (box);
g_free (markup); g_free (markup);
+ } else if (g_strcmp0 (state, "active") == 0) { + } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
+ gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel))); + gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
+ +
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@ -56,10 +56,10 @@ Index: gnome-control-center-3.32.0.1/panels/network/cc-network-panel.c
} }
static void static void
Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c Index: gnome-control-center-3.32.1/panels/network/cc-wifi-panel.c
=================================================================== ===================================================================
--- gnome-control-center-3.32.0.1.orig/panels/network/cc-wifi-panel.c --- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c +++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.c
@@ -183,21 +183,41 @@ static void @@ -183,21 +183,41 @@ static void
check_main_stack_page (CcWifiPanel *self) check_main_stack_page (CcWifiPanel *self)
{ {
@ -88,7 +88,7 @@ Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c
- 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 (!nm_version && 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 (!wireless_enabled && airplane_mode_active) else if (!wireless_enabled && airplane_mode_active)
gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode"); gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode");
@ -103,10 +103,10 @@ Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.c
} }
static void static void
Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.ui Index: gnome-control-center-3.32.1/panels/network/cc-wifi-panel.ui
=================================================================== ===================================================================
--- gnome-control-center-3.32.0.1.orig/panels/network/cc-wifi-panel.ui --- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.ui +++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.ui
@@ -315,6 +315,48 @@ @@ -315,6 +315,48 @@
<property name="name">nm-not-running</property> <property name="name">nm-not-running</property>
</packing> </packing>
@ -156,10 +156,10 @@ Index: gnome-control-center-3.32.0.1/panels/network/cc-wifi-panel.ui
</object> </object>
</child> </child>
Index: gnome-control-center-3.32.0.1/tests/meson.build Index: gnome-control-center-3.32.1/tests/meson.build
=================================================================== ===================================================================
--- gnome-control-center-3.32.0.1.orig/tests/meson.build --- gnome-control-center-3.32.1.orig/tests/meson.build
+++ gnome-control-center-3.32.0.1/tests/meson.build +++ gnome-control-center-3.32.1/tests/meson.build
@@ -1,8 +1,11 @@ @@ -1,8 +1,11 @@
subdir('common') subdir('common')
subdir('datetime') subdir('datetime')

7
gnome-control-center.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 9 06:52:13 UTC 2019 - Jonathan Kang <sckang@suse.com>
- Modified gnome-control-center-disable-error-message-for-NM.patch:
Only prompt users to use Yast to configure network when
NetworkManager is not running (boo#1134381).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 22 07:49:48 UTC 2019 - Max Lin <mlin@suse.com> Mon Apr 22 07:49:48 UTC 2019 - Max Lin <mlin@suse.com>