Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2017-10-20 16:11:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Fri Oct 20 16:11:01 2017 rev:158 rq:532970 version:3.26.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2017-10-06 10:59:20.566610438 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes
2017-10-20 16:11:03.501214478 +0200
@@ -1,0 +2,12 @@
+Tue Oct 10 01:46:32 UTC 2017 - [email protected]
+
+- Add control-center-network-add-domain-suffix-match.patch:
+ wifi: Add domain-suffix-match entry (bgo#787882, bsc#1047509).
+
+-------------------------------------------------------------------
+Mon Oct 9 07:18:58 UTC 2017 - [email protected]
+
+- Rebase gnome-control-center-disable-error-message-for-NM.patch
+ on 3.26.1.
+
+-------------------------------------------------------------------
New:
----
control-center-network-add-domain-suffix-match.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.RHgxly/_old 2017-10-20 16:11:04.337175426 +0200
+++ /var/tmp/diff_new_pack.RHgxly/_new 2017-10-20 16:11:04.337175426 +0200
@@ -37,8 +37,10 @@
# PATCH-FEATURE-OPENSUSE
gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058
[email protected] -- Follow polkit permissions for allowing/locking timezone
setting changes
Patch1: gnome-control-center-follow-polkit-permissions-for-tz.patch
-# PATCH-NEEDS-REBASE gnome-control-center-disable-error-message-for-NM.patch
bsc#989801 [email protected] -- network: Improve the check for whether NM or
wicked is running was:PATCH-FIX-OPENSUSE
+# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch
bsc#989801 [email protected] -- network: Improve the check for whether NM or
wicked is running was:PATCH-FIX-OPENSUSE
Patch2: gnome-control-center-disable-error-message-for-NM.patch
+# PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch
bgo#787882 bsc#1047509 [email protected] -- wifi: Add domain-suffix-match entry
+Patch3: control-center-network-add-domain-suffix-match.patch
### SLE only patches get 1000 or more as number.
@@ -194,8 +196,8 @@
%prep
%setup -q
%patch1 -p1
-# Needs rebase, again...
-#patch2 -p1
+%patch2 -p1
+%patch3 -p1
# SLE only patches 1000+
%if !0%{?is_opensuse}
++++++ control-center-network-add-domain-suffix-match.patch ++++++
++++ 1085 lines (skipped)
++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++
--- /var/tmp/diff_new_pack.RHgxly/_old 2017-10-20 16:11:04.369173932 +0200
+++ /var/tmp/diff_new_pack.RHgxly/_new 2017-10-20 16:11:04.373173745 +0200
@@ -1,19 +1,8 @@
-diff --git a/panels/network/cc-network-panel.c
b/panels/network/cc-network-panel.c
-index ad019a380..9b5119b77 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -64,8 +64,10 @@ struct _CcNetworkPanel
- /* widgets */
- GtkWidget *box_proxy;
- GtkWidget *box_vpn;
-+ GtkWidget *box_vpn1;
- GtkWidget *box_wired;
- GtkWidget *empty_listbox;
-+ GtkWidget *label_NM_warning;
-
- /* wireless dialog stuff */
- CmdlineOperation arg_operation;
-@@ -734,10 +736,23 @@ panel_check_network_manager_version (CcNetworkPanel
*panel)
+Index: gnome-control-center-3.26.1/panels/network/cc-network-panel.c
+===================================================================
+--- gnome-control-center-3.26.1.orig/panels/network/cc-network-panel.c
++++ gnome-control-center-3.26.1/panels/network/cc-network-panel.c
+@@ -765,10 +765,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label;
gchar *markup;
const gchar *version;
@@ -23,7 +12,8 @@
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
NULL,
++ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
++ NULL,
+ "org.freedesktop.systemd1",
+
"/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
@@ -38,14 +28,24 @@
gtk_container_remove (GTK_CONTAINER (panel),
gtk_bin_get_child (GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
-@@ -760,9 +775,17 @@ panel_check_network_manager_version (CcNetworkPanel
*panel)
+@@ -791,9 +805,27 @@ panel_check_network_manager_version (CcN
gtk_widget_show_all (box);
g_free (markup);
+ } else if (g_strcmp0 (state, "active") == 0) {
-+ gtk_widget_hide (panel->box_vpn1);
-+ gtk_widget_hide (panel->box_wired);
-+ gtk_widget_show (panel->label_NM_warning);
++ gtk_container_remove (GTK_CONTAINER (panel),
gtk_bin_get_child (GTK_BIN (panel)));
++
++ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
++ gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
++ gtk_widget_set_vexpand (box, TRUE);
++ gtk_container_add (GTK_CONTAINER (panel), box);
++
++ label = gtk_label_new (_("Please use YaST2 to configure your
network."));
++ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
++ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
++ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
++
++ gtk_widget_show_all (box);
} else {
manager_running (panel->client, NULL, panel);
}
@@ -56,46 +56,97 @@
}
static void
-@@ -816,9 +839,11 @@ cc_network_panel_class_init (CcNetworkPanelClass *klass)
-
- gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
box_proxy);
- gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
box_vpn);
-+ gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
box_vpn1);
- gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
box_wired);
- gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
empty_listbox);
- gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
sizegroup);
-+ gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel,
label_NM_warning);
-
- gtk_widget_class_bind_template_callback (widget_class,
create_connection_cb);
+Index: gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c
+===================================================================
+--- gnome-control-center-3.26.1.orig/panels/network/cc-wifi-panel.c
++++ gnome-control-center-3.26.1/panels/network/cc-wifi-panel.c
+@@ -120,16 +120,35 @@ static void
+ check_main_stack_page (CcWifiPanel *self)
+ {
+ const gchar *nm_version;
++ const gchar *state;
++ GDBusConnection *connection;
++ GDBusProxy *proxy;
++ GVariant *variant;
++
++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
++ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
++ NULL,
++ "org.freedesktop.systemd1",
++
"/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
++ "org.freedesktop.systemd1.Unit",
++ NULL, NULL);
++ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
++ state = g_variant_get_string (variant, NULL);
+
+ nm_version = nm_client_get_version (self->client);
+
+- 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)
+ 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);
}
-diff --git a/panels/network/network.ui b/panels/network/network.ui
-index 93b770d0d..0a35c3270 100644
---- a/panels/network/network.ui
-+++ b/panels/network/network.ui
-@@ -79,7 +79,7 @@
- </object>
- </child>
- <child>
-- <object class="GtkBox">
-+ <object class="GtkBox" id="box_vpn1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
-@@ -168,6 +168,14 @@
- <property name="orientation">vertical</property>
- </object>
- </child>
-+ <child>
-+ <object class="GtkLabel" id="label_NM_warning">
-+ <property name="visible">False</property>
-+ <property name="can_focus">False</property>
-+ <property name="xalign">0</property>
-+ <property name="label" translatable="yes">Please
use YaST2 to configure your network.</property>
-+ </object>
-+ </child>
- </object>
- </child>
- </object>
---
-2.13.4
-
+
+ static void
+Index: gnome-control-center-3.26.1/panels/network/wifi.ui
+===================================================================
+--- gnome-control-center-3.26.1.orig/panels/network/wifi.ui
++++ gnome-control-center-3.26.1/panels/network/wifi.ui
+@@ -298,6 +298,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>
