Honor "power-button-action-server" setting
This is a rhel9 exclusive side setting that determines the defualt power-button-action behavior when systemd-hostnamed chassis-type is "server". See also https://gitlab.com/redhat/centos-stream/rpms/gnome-settings-daemon/-/merge_requests/26 Related: RHEL-71937
This commit is contained in:
parent
4b081dea6c
commit
795bde402d
@ -1,7 +1,7 @@
|
|||||||
%define gnome_online_accounts_version 3.25.3
|
%define gnome_online_accounts_version 3.25.3
|
||||||
%define glib2_version 2.56.0
|
%define glib2_version 2.56.0
|
||||||
%define gnome_desktop_version 3.35.4
|
%define gnome_desktop_version 3.35.4
|
||||||
%define gsd_version 3.35.0
|
%define gsd_version 40.0.1-19
|
||||||
%define gsettings_desktop_schemas_version 3.37.1
|
%define gsettings_desktop_schemas_version 3.37.1
|
||||||
%define upower_version 0.99.8
|
%define upower_version 0.99.8
|
||||||
%define gtk3_version 3.22.20
|
%define gtk3_version 3.22.20
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
Name: gnome-control-center
|
Name: gnome-control-center
|
||||||
Version: 40.0
|
Version: 40.0
|
||||||
Release: 33%{?dist}
|
Release: 34%{?dist}
|
||||||
Summary: Utilities to configure the GNOME desktop
|
Summary: Utilities to configure the GNOME desktop
|
||||||
|
|
||||||
License: GPLv2+ and CC-BY-SA
|
License: GPLv2+ and CC-BY-SA
|
||||||
@ -60,6 +60,9 @@ Patch16: background-solid-colors.patch
|
|||||||
|
|
||||||
Patch17: 0001-wacom-Group-devices-using-libwacom-API-too.patch
|
Patch17: 0001-wacom-Group-devices-using-libwacom-API-too.patch
|
||||||
|
|
||||||
|
# Needs Jira ticket
|
||||||
|
Patch18: power-button-action-server.patch
|
||||||
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
@ -249,6 +252,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
|||||||
%dir %{_datadir}/gnome/wm-properties
|
%dir %{_datadir}/gnome/wm-properties
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 20 2025 Felipe Borges <feborges@redhat.com> - 40.0-34
|
||||||
|
- Honor "power-button-action-server" side setting
|
||||||
|
Related: RHEL-71937
|
||||||
|
|
||||||
* Fri Dec 13 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-33
|
* Fri Dec 13 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-33
|
||||||
- Look up grouped devices through libwacom API too
|
- Look up grouped devices through libwacom API too
|
||||||
Resolves: RHEL-17712
|
Resolves: RHEL-17712
|
||||||
|
54
power-button-action-server.patch
Normal file
54
power-button-action-server.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From 59a502e833a389d310df4f1cdfb19b835e711878 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Mon, 20 Jan 2025 15:43:34 +0100
|
||||||
|
Subject: [PATCH] power: Honor "power-button-action-server"
|
||||||
|
|
||||||
|
See https://gitlab.com/redhat/centos-stream/rpms/gnome-settings-daemon/-/merge_requests/26
|
||||||
|
---
|
||||||
|
panels/power/cc-power-panel.c | 10 ++++++++--
|
||||||
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
|
||||||
|
index 04987ff98..bb381ff70 100644
|
||||||
|
--- a/panels/power/cc-power-panel.c
|
||||||
|
+++ b/panels/power/cc-power-panel.c
|
||||||
|
@@ -679,13 +679,16 @@ power_button_row_changed_cb (CcPowerPanel *self)
|
||||||
|
gint selected_index;
|
||||||
|
HdyValueObject *value_object;
|
||||||
|
gint value;
|
||||||
|
+ gboolean is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
||||||
|
|
||||||
|
model = hdy_combo_row_get_model (self->power_button_row);
|
||||||
|
selected_index = hdy_combo_row_get_selected_index (self->power_button_row);
|
||||||
|
value_object = g_list_model_get_item (model, selected_index);
|
||||||
|
value = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (value_object), "value"));
|
||||||
|
|
||||||
|
- g_settings_set_enum (self->gsd_settings, "power-button-action", value);
|
||||||
|
+ g_settings_set_enum (self->gsd_settings,
|
||||||
|
+ is_server ? "power-button-action-server" : "power-button-action",
|
||||||
|
+ value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -1501,6 +1504,8 @@ setup_general_section (CcPowerPanel *self)
|
||||||
|
g_strcmp0 (self->chassis_type, "tablet") != 0 &&
|
||||||
|
g_strcmp0 (self->chassis_type, "handset") != 0)
|
||||||
|
{
|
||||||
|
+ gboolean is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
||||||
|
+
|
||||||
|
gtk_widget_show (GTK_WIDGET (self->power_button_row));
|
||||||
|
|
||||||
|
g_signal_handlers_block_by_func (self->power_button_row,
|
||||||
|
@@ -1510,7 +1515,8 @@ setup_general_section (CcPowerPanel *self)
|
||||||
|
can_suspend,
|
||||||
|
can_hibernate);
|
||||||
|
set_value_for_combo_row (self->power_button_row,
|
||||||
|
- g_settings_get_enum (self->gsd_settings, "power-button-action"));
|
||||||
|
+ g_settings_get_enum (self->gsd_settings,
|
||||||
|
+ is_server ? "power-button-action-server" : "power-button-action"));
|
||||||
|
g_signal_handlers_unblock_by_func (self->power_button_row,
|
||||||
|
power_button_row_changed_cb,
|
||||||
|
self);
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user