Update to 47.2
Related: RHEL-65149
This commit is contained in:
parent
99f9061ef0
commit
9b6dce7146
1
.gitignore
vendored
1
.gitignore
vendored
@ -73,3 +73,4 @@
|
|||||||
/gnome-control-center-46.2.tar.xz
|
/gnome-control-center-46.2.tar.xz
|
||||||
/gnome-control-center-46.3.tar.xz
|
/gnome-control-center-46.3.tar.xz
|
||||||
/gnome-control-center-47.alpha.tar.xz
|
/gnome-control-center-47.alpha.tar.xz
|
||||||
|
/gnome-control-center-47.2.tar.xz
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
%bcond malcontent %[!0%{?rhel}]
|
%bcond malcontent %[!0%{?rhel}]
|
||||||
|
|
||||||
Name: gnome-control-center
|
Name: gnome-control-center
|
||||||
Version: 47~alpha
|
Version: 47.2
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: Utilities to configure the GNOME desktop
|
Summary: Utilities to configure the GNOME desktop
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From fb81961ba88c70adc8ccabdb1b60786d1276108a Mon Sep 17 00:00:00 2001
|
From 47d7a4b03e576e696e97fc3e7e90812833ecb671 Mon Sep 17 00:00:00 2001
|
||||||
From: Felipe Borges <felipeborges@gnome.org>
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
Date: Tue, 10 Sep 2024 14:29:56 +0200
|
Date: Tue, 10 Sep 2024 14:29:56 +0200
|
||||||
Subject: [PATCH] power: Read downstream sleep-inactive-ac-type-server gsetting
|
Subject: [PATCH] power: Read downstream sleep-inactive-ac-type-server gsetting
|
||||||
@ -7,14 +7,14 @@ We have a downstream side-setting for when the hostnamed chassis
|
|||||||
type is "server". This allows for having a different "default" in
|
type is "server". This allows for having a different "default" in
|
||||||
each chassis-type.
|
each chassis-type.
|
||||||
---
|
---
|
||||||
panels/power/cc-power-panel.c | 20 +++++++++-----------
|
panels/power/cc-power-panel.c | 12 +++++++++---
|
||||||
1 file changed, 9 insertions(+), 11 deletions(-)
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
|
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
|
||||||
index 544cfd9be..bc320f9ef 100644
|
index a17e8490c..f7bf72be1 100644
|
||||||
--- a/panels/power/cc-power-panel.c
|
--- a/panels/power/cc-power-panel.c
|
||||||
+++ b/panels/power/cc-power-panel.c
|
+++ b/panels/power/cc-power-panel.c
|
||||||
@@ -625,8 +625,11 @@ update_automatic_suspend_label (CcPowerPanel *self)
|
@@ -462,8 +462,11 @@ update_automatic_suspend_label (CcPowerPanel *self)
|
||||||
gint ac_timeout;
|
gint ac_timeout;
|
||||||
gint battery_timeout;
|
gint battery_timeout;
|
||||||
const gchar *s;
|
const gchar *s;
|
||||||
@ -27,17 +27,17 @@ index 544cfd9be..bc320f9ef 100644
|
|||||||
battery_action = g_settings_get_enum (self->gsd_settings, "sleep-inactive-battery-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");
|
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");
|
battery_timeout = g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout");
|
||||||
@@ -781,6 +784,9 @@ setup_power_saving (CcPowerPanel *self)
|
@@ -621,6 +624,9 @@ setup_power_saving (CcPowerPanel *self)
|
||||||
|
{
|
||||||
g_autoptr(GDBusConnection) connection = NULL;
|
g_autoptr(GDBusConnection) connection = NULL;
|
||||||
g_autoptr(GError) error = NULL;
|
g_autoptr(GError) error = NULL;
|
||||||
int value;
|
|
||||||
+ gboolean is_server = FALSE;
|
+ gboolean is_server = FALSE;
|
||||||
+
|
+
|
||||||
+ is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
+ is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
||||||
|
|
||||||
/* ambient light sensor */
|
/* ambient light sensor */
|
||||||
self->iio_proxy_watch_id =
|
self->iio_proxy_watch_id =
|
||||||
@@ -838,7 +844,7 @@ setup_power_saving (CcPowerPanel *self)
|
@@ -674,7 +680,7 @@ setup_power_saving (CcPowerPanel *self)
|
||||||
*/
|
*/
|
||||||
if (g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout") == 0)
|
if (g_settings_get_int (self->gsd_settings, "sleep-inactive-ac-timeout") == 0)
|
||||||
{
|
{
|
||||||
@ -46,23 +46,15 @@ index 544cfd9be..bc320f9ef 100644
|
|||||||
g_settings_set_int (self->gsd_settings, "sleep-inactive-ac-timeout", 3600);
|
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)
|
if (g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout") == 0)
|
||||||
@@ -860,15 +866,7 @@ setup_power_saving (CcPowerPanel *self)
|
@@ -696,7 +702,7 @@ setup_power_saving (CcPowerPanel *self)
|
||||||
G_SETTINGS_BIND_DEFAULT,
|
G_SETTINGS_BIND_DEFAULT,
|
||||||
get_sleep_type, set_sleep_type, NULL, NULL);
|
get_sleep_type, set_sleep_type, NULL, NULL);
|
||||||
|
|
||||||
- g_object_set_data (G_OBJECT (self->suspend_on_battery_delay_combo), "_gsettings_key", "sleep-inactive-battery-timeout");
|
|
||||||
- value = g_settings_get_int (self->gsd_settings, "sleep-inactive-battery-timeout");
|
|
||||||
- set_value_for_combo (self->suspend_on_battery_delay_combo, value);
|
|
||||||
- g_signal_connect_object (self->suspend_on_battery_delay_combo, "changed",
|
|
||||||
- G_CALLBACK (combo_time_changed_cb), self, G_CONNECT_SWAPPED);
|
|
||||||
- g_object_bind_property (self->suspend_on_battery_switch_row, "active", self->suspend_on_battery_delay_combo, "sensitive",
|
|
||||||
- G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
|
|
||||||
-
|
|
||||||
- g_settings_bind_with_mapping (self->gsd_settings, "sleep-inactive-ac-type",
|
- 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",
|
+ 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",
|
self->suspend_on_ac_switch_row, "active",
|
||||||
G_SETTINGS_BIND_DEFAULT,
|
G_SETTINGS_BIND_DEFAULT,
|
||||||
get_sleep_type, set_sleep_type, NULL, NULL);
|
get_sleep_type, set_sleep_type, NULL, NULL);
|
||||||
--
|
--
|
||||||
2.45.2
|
2.46.2
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gnome-control-center-47.alpha.tar.xz) = 8d1efdc1cd48c63a7444dfd9f5a3029e5a2d0c172ec59b5c8335e669bb30e9764c78d8f2e12bb689b9f70bab8df903ae0025fc905a840c68e74557aec9c4ea01
|
SHA512 (gnome-control-center-47.2.tar.xz) = 0dddfffbc0d01612ca147b6c92684a77d3e31d6f8221b0667a19e58717c7d5bab24e0f7579a2800de092cfb33eebb2962e3ebcf4509ec1d9607fec16eab7c497
|
||||||
|
Loading…
Reference in New Issue
Block a user