From 0c096515b91c05484a47c535518fee8de645a537e59aed763e1428f88195e10e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 13 Jul 2021 07:26:55 +0000
Subject: [PATCH] Accepting request 904575 from
 home:yfjiang:branches:GNOME:Factory

- Rebase gnome-settings-daemon-notify-idle-resumed.patch.

OBS-URL: https://build.opensuse.org/request/show/904575
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=380
---
 ...-settings-daemon-notify-idle-resumed.patch | 24 +++++++++----------
 gnome-settings-daemon.changes                 |  5 ++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/gnome-settings-daemon-notify-idle-resumed.patch b/gnome-settings-daemon-notify-idle-resumed.patch
index e6604a5..9f7c6b8 100644
--- a/gnome-settings-daemon-notify-idle-resumed.patch
+++ b/gnome-settings-daemon-notify-idle-resumed.patch
@@ -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-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.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
++++ gnome-settings-daemon-40.0.1/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
 @@ -41,5 +41,10 @@
        <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>
@@ -13,19 +13,19 @@ Index: gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.pow
 +    </key>
    </schema>
  </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-3.34.1+3/plugins/power/gsd-power-manager.c	2019-11-21 15:37:35.435068115 +0100
-@@ -157,6 +157,7 @@
+--- gnome-settings-daemon-40.0.1.orig/plugins/power/gsd-power-manager.c
++++ gnome-settings-daemon-40.0.1/plugins/power/gsd-power-manager.c
+@@ -160,6 +160,7 @@ struct _GsdPowerManager
          NotifyNotification      *notification_ups_discharging;
          NotifyNotification      *notification_low;
          NotifyNotification      *notification_sleep_warning;
 +        NotifyNotification      *notification_resumed;
          GsdPowerActionType       sleep_action_type;
+         GHashTable              *devices_notified_ht; /* key = serial str, value = UpDeviceLevel */
          gboolean                 battery_is_low; /* laptop battery low, or UPS discharging */
- 
-@@ -191,6 +192,7 @@
+@@ -196,6 +197,7 @@ struct _GsdPowerManager
          gboolean                 inhibit_suspend_taken;
          guint                    inhibit_lid_switch_timer_id;
          gboolean                 is_virtual_machine;
@@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
  
          /* Idles */
          GnomeIdleMonitor        *idle_monitor;
-@@ -1497,6 +1499,49 @@
+@@ -1614,6 +1616,49 @@ is_session_active (GsdPowerManager *mana
  }
  
  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)
  {
          gboolean ret = FALSE;
-@@ -1573,6 +1618,7 @@
+@@ -1694,6 +1739,7 @@ idle_set_mode (GsdPowerManager *manager,
                          action_type = g_settings_get_enum (manager->settings,
                                                             "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);
  
          /* turn on screen and restore user-selected brightness level */
-@@ -2353,6 +2399,12 @@
+@@ -2502,6 +2548,12 @@ handle_suspend_actions (GsdPowerManager
  static void
  handle_resume_actions (GsdPowerManager *manager)
  {
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 2cbf520..11e555b 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -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>