commit gnome-control-center for openSUSE:Factory
Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2019-05-16 21:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center" Thu May 16 21:57:08 2019 rev:178 rq:701856 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2019-05-03 22:18:58.936291884 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new.5148/gnome-control-center.changes 2019-05-16 21:57:12.270858799 +0200 @@ -1,0 +2,7 @@ +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). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++ --- /var/tmp/diff_new_pack.9YMik2/_old 2019-05-16 21:57:12.846858547 +0200 +++ /var/tmp/diff_new_pack.9YMik2/_new 2019-05-16 21:57:12.850858545 +0200 @@ -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.0.1/panels/network/cc-network-panel.c -@@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN +--- gnome-control-center-3.32.1.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-3.32.1/panels/network/cc-network-panel.c +@@ -775,10 +775,24 @@ panel_check_network_manager_version (CcN GtkWidget *label; gchar *markup; const gchar *version; @@ -28,11 +28,11 @@ gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel))); 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); 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))); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); @@ -56,10 +56,10 @@ } 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.0.1/panels/network/cc-wifi-panel.c +--- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.c ++++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.c @@ -183,21 +183,41 @@ static void check_main_stack_page (CcWifiPanel *self) { @@ -88,7 +88,7 @@ - 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) ++ else if (!nm_version && g_strcmp0 (state, "active") == 0) + gtk_stack_set_visible_child_name (self->main_stack, "wicked-running"); else if (!wireless_enabled && airplane_mode_active) gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode"); @@ -103,10 +103,10 @@ } 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.0.1/panels/network/cc-wifi-panel.ui +--- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.ui ++++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.ui @@ -315,6 +315,48 @@ <property name="name">nm-not-running</property> </packing> @@ -156,10 +156,10 @@ </object> </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.0.1/tests/meson.build +--- gnome-control-center-3.32.1.orig/tests/meson.build ++++ gnome-control-center-3.32.1/tests/meson.build @@ -1,8 +1,11 @@ subdir('common') subdir('datetime')
participants (1)
-
root