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

Accepting request 921680 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/921680
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=467
This commit is contained in:
Bjørn Lie 2021-09-27 08:57:19 +00:00 committed by Git OBS Bridge
parent f60d7c87cb
commit f6f2331889
6 changed files with 246 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnome-control-center-bring-back-firewall-zone.patch
View File

@ -1,7 +1,7 @@
Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethernet.c
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-ethernet.c
+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethernet.c
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-ethernet.c
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c
@@ -27,6 +27,7 @@
#include "ce-page.h"
@ -96,10 +96,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethern
self->setting_connection = nm_connection_get_setting_connection (connection);
self->setting_wired = nm_connection_get_setting_wired (connection);
Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-security.c
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-security.c
+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-security.c
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-security.c
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c
@@ -27,6 +27,7 @@
#include "ce-page.h"
@ -171,10 +171,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-securi
}
static void
Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-vpn.c
+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-vpn.c
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
@@ -35,6 +35,8 @@ struct _CEPageVpn
GtkLabel *failure_label;
@ -211,10 +211,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c
}
static void
Index: gnome-control-center-40.0/panels/network/connection-editor/ethernet-page.ui
Index: gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/ethernet-page.ui
+++ gnome-control-center-40.0/panels/network/connection-editor/ethernet-page.ui
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ethernet-page.ui
+++ gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui
@@ -159,6 +159,36 @@
</packing>
</child>
@ -252,10 +252,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ethernet-page.
<placeholder/>
</child>
<child>
Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.c
Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c
===================================================================
--- /dev/null
+++ gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.c
+++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c
@@ -0,0 +1,125 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -382,10 +382,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpe
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
+ g_free (zone);
+}
Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.h
Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h
===================================================================
--- /dev/null
+++ gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.h
+++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h
@@ -0,0 +1,33 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@ -420,10 +420,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpe
+
+
+#endif /* _FIREWALL_HELPERS_H_ */
Index: gnome-control-center-40.0/panels/network/connection-editor/meson.build
Index: gnome-control-center-41.0/panels/network/connection-editor/meson.build
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/meson.build
+++ gnome-control-center-40.0/panels/network/connection-editor/meson.build
--- gnome-control-center-41.0.orig/panels/network/connection-editor/meson.build
+++ gnome-control-center-41.0/panels/network/connection-editor/meson.build
@@ -12,6 +12,7 @@ sources = files(
'ce-page-vpn.c',
'ce-page-wifi.c',
@ -432,10 +432,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/meson.build
'net-connection-editor.c',
'vpn-helpers.c'
)
Index: gnome-control-center-40.0/panels/network/connection-editor/security-page.ui
Index: gnome-control-center-41.0/panels/network/connection-editor/security-page.ui
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/security-page.ui
+++ gnome-control-center-40.0/panels/network/connection-editor/security-page.ui
--- gnome-control-center-41.0.orig/panels/network/connection-editor/security-page.ui
+++ gnome-control-center-41.0/panels/network/connection-editor/security-page.ui
@@ -47,6 +47,37 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@ -474,10 +474,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/security-page.
<placeholder/>
</child>
</object>
Index: gnome-control-center-40.0/panels/network/connection-editor/vpn-page.ui
Index: gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
===================================================================
--- gnome-control-center-40.0.orig/panels/network/connection-editor/vpn-page.ui
+++ gnome-control-center-40.0/panels/network/connection-editor/vpn-page.ui
--- gnome-control-center-41.0.orig/panels/network/connection-editor/vpn-page.ui
+++ gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
@@ -51,6 +51,45 @@
</packing>
</child>

193
gnome-control-center-disable-error-message-for-NM.patch Normal file
View File

@ -0,0 +1,193 @@
From b5ae9ddfa0df356ae7bf9445631b756883226825 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Sun, 26 Sep 2021 11:04:13 +0800
Subject: [PATCH] add error messages when wicked is used as network manager
---
panels/network/cc-network-panel.c | 37 ++++++++++++++++++++++++++-
panels/network/cc-wifi-panel.c | 22 +++++++++++++++-
panels/network/cc-wifi-panel.ui | 42 +++++++++++++++++++++++++++++++
tests/meson.build | 3 +++
4 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 01b164ea0..d32e94d09 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -643,10 +643,24 @@ static void
panel_check_network_manager_version (CcNetworkPanel *self)
{
const gchar *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);
/* parse running version */
version = nm_client_get_version (self->client);
- if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
GtkWidget *box;
GtkWidget *label;
g_autofree gchar *markup = NULL;
@@ -671,10 +685,31 @@ panel_check_network_manager_version (CcNetworkPanel *self)
gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_widget_show_all (box);
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
+ GtkWidget *box;
+ GtkWidget *label;
+
+ gtk_container_remove (GTK_CONTAINER (self), gtk_bin_get_child (GTK_BIN (self)));
+
+ 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 (self), 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 (self);
}
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 9ca6e6ee5..c4622e684 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -439,21 +439,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;
+
+ 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);
wireless_enabled = nm_client_wireless_get_enabled (self->client);
airplane_mode_active = cc_list_row_get_active (self->rfkill_row);
- 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 (!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");
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
diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
index 2ac7570f9..5a53f9a57 100644
--- a/panels/network/cc-wifi-panel.ui
+++ b/panels/network/cc-wifi-panel.ui
@@ -318,6 +318,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>
diff --git a/tests/meson.build b/tests/meson.build
index d4fe361ef..da3bd104d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,8 +1,11 @@
subdir('common')
#subdir('datetime')
+# Disable tests for network panel, boo#1128195
+if false
if host_is_linux
subdir('network')
endif
+endif
subdir('interactive-panels')
--
2.31.1

8
gnome-control-center-info-never-use-gnome-software.patch
View File

@ -1,8 +1,8 @@
Index: gnome-control-center-40.0/panels/info-overview/cc-info-overview-panel.c
Index: gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c
===================================================================
--- gnome-control-center-40.0.orig/panels/info-overview/cc-info-overview-panel.c
+++ gnome-control-center-40.0/panels/info-overview/cc-info-overview-panel.c
@@ -777,8 +777,8 @@ info_overview_panel_setup_overview (CcIn
--- gnome-control-center-41.0.orig/panels/info-overview/cc-info-overview-panel.c
+++ gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c
@@ -791,8 +791,8 @@ does_gnome_software_allow_updates (void)
static gboolean
does_gnome_software_exist (void)
{

16
gnome-control-center-more-power-button-actions.patch
View File

@ -1,17 +1,13 @@
Index: gnome-control-center-40.0/panels/power/cc-power-panel.c
Index: gnome-control-center-41.0/panels/power/cc-power-panel.c
===================================================================
--- gnome-control-center-40.0.orig/panels/power/cc-power-panel.c
+++ gnome-control-center-40.0/panels/power/cc-power-panel.c
@@ -1078,10 +1078,11 @@ populate_power_button_model (GtkTreeMode
char *name;
GsdPowerButtonActionType value;
} actions[] = {
+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING },
--- gnome-control-center-41.0.orig/panels/power/cc-power-panel.c
+++ gnome-control-center-41.0/panels/power/cc-power-panel.c
@@ -796,7 +796,8 @@ populate_power_button_row (HdyComboRow *
{ N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND },
- { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
{ N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
{ N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE },
- { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }
+ { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING },
+ { N_("Force Off"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }
};
guint i;

13
gnome-control-center.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Sep 26 07:09:41 UTC 2021 - Jonathan Kang <songchuan.kang@suse.com>
- Bring back gnome-control-center-disable-error-message-for-NM.patch
and rebase it against latest code base(bsc#1190875).
-------------------------------------------------------------------
Fri Sep 24 19:39:55 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Add power-profiles-daemon Recommends: Support the new power
profiles available.
- Refresh patches with quilt.
-------------------------------------------------------------------
Mon Sep 20 21:43:27 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

5
gnome-control-center.spec
View File

@ -34,6 +34,8 @@ Group: System/GUI/GNOME
URL: https://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-control-center/41/%{name}-%{version}.tar.xz
# PATCH-FIX-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
### patches for Leap >= 15 plus SLE >= 15, but not TW
# PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
Patch1001: gnome-control-center-info-never-use-gnome-software.patch
@ -114,6 +116,8 @@ Recommends: cups-pk-helper
Recommends: dbus(com.intel.dleyna-server)
# the printers panel can use the dbus service
Recommends: system-config-printer-dbus-service
# For the power panel
Recommends: power-profiles-daemon
Provides: acme
Provides: fontilus
Provides: themus
@ -187,6 +191,7 @@ GNOME control center.
%prep
%setup -q
%patch0 -p1
# patches for Leap >= 15 plus SLE >= 15, but not TW
%if 0%{?sle_version} >= 150000
%patch1001 -p1