rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

Accepting request 906035 from GNOME:Factory

Browse Source 
- Rebase gnome-settings-daemon-notify-idle-resumed.patch. (forwarded request 904575 from yfjiang)

OBS-URL: https://build.opensuse.org/request/show/906035
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=172
This commit is contained in:
Dominique Leuenberger 2021-07-15 21:58:54 +00:00 committed by Git OBS Bridge
commit b9645bc750
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnome-settings-daemon-notify-idle-resumed.patch
View File

@ -1,7 +1,7 @@
Index: gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in Index: gnome-settings-daemon-40.0.1/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
=================================================================== ===================================================================
--- gnome-settings-daemon-3.34.1+3.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2019-11-21 15:37:24.539068623 +0100 --- gnome-settings-daemon-40.0.1.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
+++ gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in 2019-11-21 15:37:54.099067245 +0100 +++ gnome-settings-daemon-40.0.1/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
@@ -41,5 +41,10 @@ @@ -41,5 +41,10 @@
<summary>Power button action</summary> <summary>Power button action</summary>
<description>The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend).</description> <description>The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend).</description>
@ -13,19 +13,19 @@ Index: gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.pow
+ </key> + </key>
</schema> </schema>
</schemalist> </schemalist>
Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c Index: gnome-settings-daemon-40.0.1/plugins/power/gsd-power-manager.c
=================================================================== ===================================================================
--- gnome-settings-daemon-3.34.1+3.orig/plugins/power/gsd-power-manager.c 2019-11-21 15:37:24.539068623 +0100 --- gnome-settings-daemon-40.0.1.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c 2019-11-21 15:37:35.435068115 +0100 +++ gnome-settings-daemon-40.0.1/plugins/power/gsd-power-manager.c
@@ -157,6 +157,7 @@ @@ -160,6 +160,7 @@ struct _GsdPowerManager
NotifyNotification *notification_ups_discharging; NotifyNotification *notification_ups_discharging;
NotifyNotification *notification_low; NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning; NotifyNotification *notification_sleep_warning;
+ NotifyNotification *notification_resumed; + NotifyNotification *notification_resumed;
GsdPowerActionType sleep_action_type; GsdPowerActionType sleep_action_type;
GHashTable *devices_notified_ht; /* key = serial str, value = UpDeviceLevel */
gboolean battery_is_low; /* laptop battery low, or UPS discharging */ gboolean battery_is_low; /* laptop battery low, or UPS discharging */
@@ -196,6 +197,7 @@ struct _GsdPowerManager
@@ -191,6 +192,7 @@
gboolean inhibit_suspend_taken; gboolean inhibit_suspend_taken;
guint inhibit_lid_switch_timer_id; guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine; gboolean is_virtual_machine;
@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
/* Idles */ /* Idles */
GnomeIdleMonitor *idle_monitor; GnomeIdleMonitor *idle_monitor;
@@ -1497,6 +1499,49 @@ @@ -1614,6 +1616,49 @@ is_session_active (GsdPowerManager *mana
} }
static void static void
@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@@ -1573,6 +1618,7 @@ @@ -1694,6 +1739,7 @@ idle_set_mode (GsdPowerManager *manager,
action_type = g_settings_get_enum (manager->settings, action_type = g_settings_get_enum (manager->settings,
"sleep-inactive-ac-type"); "sleep-inactive-ac-type");
} }
@ -91,7 +91,7 @@ Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
do_power_action_type (manager, action_type); do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */ /* turn on screen and restore user-selected brightness level */
@@ -2353,6 +2399,12 @@ @@ -2502,6 +2548,12 @@ handle_suspend_actions (GsdPowerManager
static void static void
handle_resume_actions (GsdPowerManager *manager) handle_resume_actions (GsdPowerManager *manager)
{ {

5
gnome-settings-daemon.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 7 10:43:26 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 15 13:18:12 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org> Thu Apr 15 13:18:12 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>