Hello community,
here is the log from the commit of package cinnamon-settings-daemon for
openSUSE:Factory checked in at 2018-10-18 15:35:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon"
Thu Oct 18 15:35:30 2018 rev:18 rq:642665 version:3.8.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes
2018-09-25 15:43:05.281247885 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new/cinnamon-settings-daemon.changes
2018-10-18 15:36:21.214296939 +0200
@@ -1,0 +2,8 @@
+Wed Oct 17 14:17:51 UTC 2018 - [email protected]
+
+- Update to version 3.8.7:
+ * csd-power-manager.c: During lid action, only lock the screen if
+ "blank" is the selected action. If "do nothing" is selected,
+ then actually do nothing.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-settings-daemon-3.8.6.tar.gz
New:
----
cinnamon-settings-daemon-3.8.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.Pfbtnw/_old 2018-10-18 15:36:24.118293606 +0200
+++ /var/tmp/diff_new_pack.Pfbtnw/_new 2018-10-18 15:36:24.122293601 +0200
@@ -17,7 +17,7 @@
Name: cinnamon-settings-daemon
-Version: 3.8.6
+Version: 3.8.7
Release: 0
Summary: The settings Daemon for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
++++++ cinnamon-settings-daemon-3.8.6.tar.gz ->
cinnamon-settings-daemon-3.8.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.6/configure.ac
new/cinnamon-settings-daemon-3.8.7/configure.ac
--- old/cinnamon-settings-daemon-3.8.6/configure.ac 2018-09-20
12:21:53.000000000 +0200
+++ new/cinnamon-settings-daemon-3.8.7/configure.ac 2018-10-16
17:39:24.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ([2.60])
AC_INIT([cinnamon-settings-daemon],
- [3.8.6],
+ [3.8.7],
[https://github.com/linuxmint/cinnamon-settings-daemon/issues])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-3.8.6/debian/changelog
new/cinnamon-settings-daemon-3.8.7/debian/changelog
--- old/cinnamon-settings-daemon-3.8.6/debian/changelog 2018-09-20
12:21:53.000000000 +0200
+++ new/cinnamon-settings-daemon-3.8.7/debian/changelog 2018-10-16
17:39:24.000000000 +0200
@@ -1,3 +1,10 @@
+cinnamon-settings-daemon (3.8.7) tara; urgency=medium
+
+ [ Michael Webster ]
+ * csd-power-manager.c: During lid action, only lock the screen if 'blank' is
the selected action. If 'do nothing' is selected, then actually do nothing.
+
+ -- Clement Lefebvre <[email protected]> Tue, 16 Oct 2018 16:39:01 +0100
+
cinnamon-settings-daemon (3.8.6) tara; urgency=medium
[ Jeremy Bicha ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-3.8.6/plugins/power/csd-power-manager.c
new/cinnamon-settings-daemon-3.8.7/plugins/power/csd-power-manager.c
--- old/cinnamon-settings-daemon-3.8.6/plugins/power/csd-power-manager.c
2018-09-20 12:21:53.000000000 +0200
+++ new/cinnamon-settings-daemon-3.8.7/plugins/power/csd-power-manager.c
2018-10-16 17:39:24.000000000 +0200
@@ -2002,15 +2002,33 @@
}
static void
+turn_monitors_off (CsdPowerManager *manager)
+{
+ gboolean ret;
+ GError *error = NULL;
+
+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+ GNOME_RR_DPMS_OFF,
+ &error);
+ if (!ret) {
+ g_warning ("failed to turn the panel off for policy action: %s",
+ error->message);
+ g_error_free (error);
+ }
+}
+
+static void
do_power_action_type (CsdPowerManager *manager,
CsdPowerActionType action_type)
{
- gboolean ret;
- GError *error = NULL;
-
switch (action_type) {
case CSD_POWER_ACTION_SUSPEND:
- ;
+ if (should_lock_on_suspend (manager)) {
+ lock_screensaver (manager);
+ }
+
+ turn_monitors_off (manager);
+
gboolean hybrid = g_settings_get_boolean
(manager->priv->settings_cinnamon_session,
"prefer-hybrid-sleep");
csd_power_suspend (manager->priv->use_logind,
manager->priv->upower_proxy, hybrid);
@@ -2019,6 +2037,12 @@
cinnamon_session_shutdown ();
break;
case CSD_POWER_ACTION_HIBERNATE:
+ if (should_lock_on_suspend (manager)) {
+ lock_screensaver (manager);
+ }
+
+ turn_monitors_off (manager);
+
csd_power_hibernate (manager->priv->use_logind,
manager->priv->upower_proxy);
break;
case CSD_POWER_ACTION_SHUTDOWN:
@@ -2028,14 +2052,10 @@
csd_power_poweroff (manager->priv->use_logind);
break;
case CSD_POWER_ACTION_BLANK:
- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
- GNOME_RR_DPMS_OFF,
- &error);
- if (!ret) {
- g_warning ("failed to turn the panel off for policy
action: %s",
- error->message);
- g_error_free (error);
- }
+ /* Lock first or else xrandr might reconfigure stuff and the
ss's coverage
+ * may be incorrect upon return. */
+ lock_screensaver (manager);
+ turn_monitors_off (manager);
break;
case CSD_POWER_ACTION_NOTHING:
break;
@@ -2397,29 +2417,10 @@
g_warning ("to prevent damage, now forcing suspend");
do_power_action_type (manager,
CSD_POWER_ACTION_SUSPEND);
return;
- } else {
- /* maybe lock the screen if the lid is closed */
- lock_screensaver (manager);
}
-#else
- lock_screensaver (manager);
#endif
}
- if (should_lock_on_suspend (manager)) {
- lock_screensaver (manager);
- }
-
- /* ensure we turn the panel back on after resume */
- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
- GNOME_RR_DPMS_OFF,
- &error);
- if (!ret) {
- g_warning ("failed to turn the panel off after lid close: %s",
- error->message);
- g_clear_error (&error);
- }
-
/* only toggle keyboard if present and not already toggled */
if (manager->priv->upower_kbd_proxy &&
manager->priv->kbd_brightness_old == -1) {
@@ -4009,6 +4010,13 @@
static void
handle_suspend_actions (CsdPowerManager *manager)
{
+ /* Is this even necessary? We lock ahead of the suspend initiation,
+ * during do_power_action_type(). This is a signal from logind or
+ * upower that we're about to suspend. That may have originated in
+ * this module, or elsewhere (cinnamon-session via menu or user
+ * applet. Lock is handled there as well... but just in case I
+ * suppose.)
+ */
if (should_lock_on_suspend (manager)) {
lock_screensaver (manager);
}
