rpms/gnome-control-center
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Honor sleep inactive-act-type-server g-s-d setting"

Browse Source 
This reverts commit 8f8a154e0b.

In https://gitlab.com/redhat/centos-stream/rpms/gnome-settings-daemon/-/merge_requests/29
we introduce a new mechanism to override the setting default values for
servers. This way, GNOME Control Center no longer needs to ship a
companion workaround for servers.

Related: RHEL-77332
This commit is contained in:
Felipe Borges 2025-01-31 14:03:28 +01:00 committed by Felipe Borges
parent ae377685f9
commit fed4d01e9e
2 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-control-center.spec
View File

@ -24,9 +24,6 @@ License: GPL-2.0-or-later AND CC0-1.0
URL: https://gitlab.gnome.org/GNOME/gnome-control-center/
Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
# https://issues.redhat.com/browse/RHEL-59200
Patch0: power-honor-sleep-inactive-ac-type-server-setting.patch
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl libxslt
BuildRequires: gcc

60
power-honor-sleep-inactive-ac-type-server-setting.patch
View File

@ -1,60 +0,0 @@
From 47d7a4b03e576e696e97fc3e7e90812833ecb671 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Tue, 10 Sep 2024 14:29:56 +0200
Subject: [PATCH] power: Read downstream sleep-inactive-ac-type-server gsetting
We have a downstream side-setting for when the hostnamed chassis
type is "server". This allows for having a different "default" in
each chassis-type.
---
panels/power/cc-power-panel.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index a17e8490c..f7bf72be1 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -462,8 +462,11 @@ update_automatic_suspend_label (CcPowerPanel *self)
gint ac_timeout;
gint battery_timeout;
const gchar *s;
+ gboolean is_server = FALSE;
- ac_action = g_settings_get_enum (self->gsd_settings, "sleep-inactive-ac-type");
+ is_server = g_strcmp0 (self->chassis_type, "server") == 0;
+
+ ac_action = g_settings_get_enum (self->gsd_settings, is_server ? "sleep-inactive-ac-type-server" : "sleep-inactive-ac-type");
battery_action = g_settings_get_enum (self->gsd_settings, "sleep-inactive-battery-type");
ac_timeout = g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout");
battery_timeout = g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout");
@@ -621,6 +624,9 @@ setup_power_saving (CcPowerPanel *self)
{
g_autoptr(GDBusConnection) connection = NULL;
g_autoptr(GError) error = NULL;
+ gboolean is_server = FALSE;
+
+ is_server = g_strcmp0 (self->chassis_type, "server") == 0;
/* ambient light sensor */
self->iio_proxy_watch_id =
@@ -674,7 +680,7 @@ setup_power_saving (CcPowerPanel *self)
*/
if (g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout") == 0)
{
- g_settings_set_enum (self->gsd_settings, "sleep-inactive-ac-type", GSD_POWER_ACTION_NOTHING);
+ g_settings_set_enum (self->gsd_settings, is_server ? "sleep-inactive-ac-type-server" : "sleep-inactive-ac-type", GSD_POWER_ACTION_NOTHING);
g_settings_set_int (self->gsd_settings, "sleep-inactive-ac-timeout", 3600);
}
if (g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout") == 0)
@@ -696,7 +702,7 @@ setup_power_saving (CcPowerPanel *self)
G_SETTINGS_BIND_DEFAULT,
get_sleep_type, set_sleep_type, NULL, NULL);
- g_settings_bind_with_mapping (self->gsd_settings, "sleep-inactive-ac-type",
+ g_settings_bind_with_mapping (self->gsd_settings, is_server ? "sleep-inactive-ac-type-server" : "sleep-inactive-ac-type",
self->suspend_on_ac_switch_row, "active",
G_SETTINGS_BIND_DEFAULT,
get_sleep_type, set_sleep_type, NULL, NULL);
--
2.46.2