2019-11-26 10:26:17 +01:00
Index: gnome-settings-daemon-3.34.1+3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
2019-10-09 12:41:42 +02:00
===================================================================
2019-11-26 10:26:17 +01:00
--- 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
2018-04-13 08:43:11 +02:00
@@ -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>
2013-01-21 17:38:42 +01:00
</key>
+ <key name="notify-idle-resumed" type="b">
+ <default>true</default>
2019-11-26 10:26:17 +01:00
+ <summary>If an information message should be displayed when returning from idle sleep.</summary>
+ <description>If an information message should be displayed when returning from idle sleep.</description>
2013-01-21 17:38:42 +01:00
+ </key>
</schema>
</schemalist>
2019-11-26 10:26:17 +01:00
Index: gnome-settings-daemon-3.34.1+3/plugins/power/gsd-power-manager.c
2019-10-09 12:41:42 +02:00
===================================================================
2019-11-26 10:26:17 +01:00
--- 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 @@
2014-05-28 13:59:19 +02:00
NotifyNotification *notification_ups_discharging;
2013-01-21 17:38:42 +01:00
NotifyNotification *notification_low;
2013-03-13 23:54:12 +01:00
NotifyNotification *notification_sleep_warning;
2013-01-21 17:38:42 +01:00
+ NotifyNotification *notification_resumed;
2013-03-13 23:54:12 +01:00
GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or UPS discharging */
2019-11-26 10:26:17 +01:00
@@ -191,6 +192,7 @@
2019-10-04 17:46:22 +02:00
gboolean inhibit_suspend_taken;
2013-03-13 23:54:12 +01:00
guint inhibit_lid_switch_timer_id;
2013-01-21 17:38:42 +01:00
gboolean is_virtual_machine;
2015-03-19 15:37:09 +01:00
+ GsdPowerActionType last_idle_power_action;
2013-01-21 17:38:42 +01:00
2013-03-13 23:54:12 +01:00
/* Idles */
GnomeIdleMonitor *idle_monitor;
2019-11-26 10:26:17 +01:00
@@ -1497,6 +1499,49 @@
2013-01-21 17:38:42 +01:00
}
static void
+show_resumed_notification (GsdPowerManager *manager)
+{
+ GError *error = NULL;
+ gboolean ret;
+
+ /* don't show when running under GDM */
+ if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+ g_debug ("running under gdm, so no notification");
+ return;
+ }
+
2019-10-04 17:46:22 +02:00
+ ret = g_settings_get_boolean (manager->settings, "notify-idle-resumed");
2013-01-21 17:38:42 +01:00
+ if (!ret)
+ return;
+
+ /* close any existing notification of this class */
2019-10-04 17:46:22 +02:00
+ notify_close_if_showing (&manager->notification_resumed);
2013-01-21 17:38:42 +01:00
+
+ /* create a new notification */
+ create_notification (_("System resumed from sleep"),
+ _("The system automatically went to sleep because the system was idle."),
2019-10-09 12:41:42 +02:00
+ NULL, NOTIFICATION_PRIVACY_SYSTEM,
2019-10-04 17:46:22 +02:00
+ &manager->notification_resumed);
+ notify_notification_set_timeout (manager->notification_resumed,
2013-01-21 17:38:42 +01:00
+ GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT);
2019-10-04 17:46:22 +02:00
+ notify_notification_set_urgency (manager->notification_resumed,
2013-01-21 17:38:42 +01:00
+ NOTIFY_URGENCY_NORMAL);
+ /* TRANSLATORS: this is the notification application name */
2019-10-04 17:46:22 +02:00
+ notify_notification_set_app_name (manager->notification_resumed, _("Power"));
+ notify_notification_set_hint (manager->notification_resumed,
2013-01-21 17:38:42 +01:00
+ "transient", g_variant_new_boolean (TRUE));
+
+ /* try to show */
2019-10-04 17:46:22 +02:00
+ ret = notify_notification_show (manager->notification_resumed,
2013-01-21 17:38:42 +01:00
+ &error);
+ if (!ret) {
+ g_warning ("failed to show notification: %s", error->message);
+ g_error_free (error);
2019-10-04 17:46:22 +02:00
+ g_object_unref (manager->notification_resumed);
2013-01-21 17:38:42 +01:00
+ }
+}
+
+static void
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
2019-11-26 10:26:17 +01:00
@@ -1573,6 +1618,7 @@
2019-10-04 17:46:22 +02:00
action_type = g_settings_get_enum (manager->settings,
2013-01-21 17:38:42 +01:00
"sleep-inactive-ac-type");
}
2019-10-04 17:46:22 +02:00
+ manager->last_idle_power_action = action_type;
2013-01-21 17:38:42 +01:00
do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */
2019-11-26 10:26:17 +01:00
@@ -2353,6 +2399,12 @@
2014-05-28 13:59:19 +02:00
static void
handle_resume_actions (GsdPowerManager *manager)
{
2019-10-04 17:46:22 +02:00
+ if (manager->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
+ manager->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE)
2013-01-21 17:38:42 +01:00
+ show_resumed_notification (manager);
+
2019-10-04 17:46:22 +02:00
+ manager->last_idle_power_action = GSD_POWER_ACTION_NOTHING;
2013-01-21 17:38:42 +01:00
+
/* ensure we turn the panel back on after resume */
2013-03-13 23:54:12 +01:00
backlight_enable (manager);