Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2019-03-26 15:37:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Tue Mar 26 15:37:59 2019 rev:176 rq:687775 version:3.30.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2019-03-22 14:56:05.493999523 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new.25356/gnome-control-center.changes
2019-03-26 15:38:02.548357498 +0100
@@ -1,0 +2,6 @@
+Tue Mar 19 02:20:35 UTC 2019 - sck...@suse.com
+
+- Rebase gnome-control-center-disable-error-message-for-NM.patch
+ (bsc#1128195).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.DTixt5/_old 2019-03-26 15:38:04.536356707 +0100
+++ /var/tmp/diff_new_pack.DTixt5/_new 2019-03-26 15:38:04.540356706 +0100
@@ -34,7 +34,7 @@
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 sck...@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 sck...@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 sck...@suse.com -- wifi: Add domain-suffix-match entry
Patch1: control-center-network-add-domain-suffix-match.patch
@@ -190,7 +190,7 @@
%prep
%setup -q
-#patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++
--- /var/tmp/diff_new_pack.DTixt5/_old 2019-03-26 15:38:04.568356695 +0100
+++ /var/tmp/diff_new_pack.DTixt5/_new 2019-03-26 15:38:04.572356693 +0100
@@ -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 @@
}
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 @@
+ 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 @@
- <property name="name">nm-not-running</property>
- </packing>
- </child>
-+
-+ <!-- "Wicked Running" page -->
-+ <child>
-+ <object class="GtkBox">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="expand">True</property>
-+ <property name="halign">center</property>
-+ <property name="valign">center</property>
-+ <property name="orientation">vertical</property>
-+ <property name="margin">18</property>
-+ <property name="spacing">18</property>
-+ <child type="center">
-+ <object class="GtkImage">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="icon_name">face-sad-symbolic</property>
-+ <property name="pixel_size">128</property>
-+ <style>
-+ <class name="dim-label" />
-+ </style>
-+ </object>
-+ </child>
-+ <child>
-+ <object class="GtkLabel">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="wrap">True</property>
-+ <property name="label" translatable="yes">Please use YaST2 to
configure your network.</property>
-+ <attributes>
-+ <attribute name="scale" value="1.42" />
-+ </attributes>
-+ </object>
-+ <packing>
-+ <property name="pack-type">end</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="name">wicked-running</property>
-+ </packing>
-+ </child>
- </object>
- </child>
- </template>
+--- 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 @@
+ <property name="name">nm-not-running</property>
+ </packing>
+ </child>
++
++ <!-- "Wicked Running" page -->
++ <child>
++ <object class="GtkBox">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="expand">True</property>
++ <property name="halign">center</property>
++ <property name="valign">center</property>
++ <property name="orientation">vertical</property>
++ <property name="margin">18</property>
++ <property name="spacing">18</property>
++ <child type="center">
++ <object class="GtkImage">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property
name="icon_name">face-sad-symbolic</property>
++ <property name="pixel_size">128</property>
++ <style>
++ <class name="dim-label" />
++ </style>
++ </object>
++ </child>
++ <child>
++ <object class="GtkLabel">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="wrap">True</property>
++ <property name="label" translatable="yes">Please
use YaST2 to configure your network.</property>
++ <attributes>
++ <attribute name="scale" value="1.42" />
++ </attributes>
++ </object>
++ <packing>
++ <property name="pack-type">end</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="name">wicked-running</property>
++ </packing>
++ </child>
+ </object>
+ </child>
+
