Hello community,
here is the log from the commit of package cinnamon-settings-daemon for
openSUSE:Factory checked in at 2016-03-16 10:35:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes
2016-01-22 01:06:54.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new/cinnamon-settings-daemon.changes
2016-03-16 10:35:05.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Mar 9 18:09:32 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to 2.8.4:
+ * power manager: Prevent sleep properly when the session has a
+ sleep (not idle) inhibitor active.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-settings-daemon-2.8.3.tar.gz
New:
----
cinnamon-settings-daemon-2.8.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.0M4GLo/_old 2016-03-16 10:35:06.000000000 +0100
+++ /var/tmp/diff_new_pack.0M4GLo/_new 2016-03-16 10:35:06.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-settings-daemon
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cinnamon-settings-daemon
-Version: 2.8.3
+Version: 2.8.4
Release: 0
Summary: The settings Daemon for the Cinnamon Desktop
License: GPL-2.0+ and LGPL-2.1
++++++ cinnamon-settings-daemon-2.8.3.tar.gz ->
cinnamon-settings-daemon-2.8.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-2.8.3/configure.ac
new/cinnamon-settings-daemon-2.8.4/configure.ac
--- old/cinnamon-settings-daemon-2.8.3/configure.ac 2015-11-26
21:29:41.000000000 +0100
+++ new/cinnamon-settings-daemon-2.8.4/configure.ac 2016-03-07
18:11:21.000000000 +0100
@@ -1,7 +1,7 @@
AC_PREREQ([2.60])
AC_INIT([cinnamon-settings-daemon],
- [2.8.3],
+ [2.8.4],
[https://github.com/linuxmint/cinnamon-settings-daemon/issues])
AC_CONFIG_SRCDIR([cinnamon-settings-daemon/cinnamon-settings-manager.c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-2.8.3/debian/changelog
new/cinnamon-settings-daemon-2.8.4/debian/changelog
--- old/cinnamon-settings-daemon-2.8.3/debian/changelog 2015-11-26
21:29:41.000000000 +0100
+++ new/cinnamon-settings-daemon-2.8.4/debian/changelog 2016-03-07
18:11:21.000000000 +0100
@@ -1,3 +1,10 @@
+cinnamon-settings-daemon (2.8.4) rosa; urgency=medium
+
+ [ Michael Webster ]
+ * power manager: prevent sleep properly when the session has a sleep (not
idle) inhibitor active
+
+ -- Clement Lefebvre <r...@linuxmint.com> Mon, 07 Mar 2016 17:10:45 +0000
+
cinnamon-settings-daemon (2.8.3) rosa; urgency=medium
* Re-added code removed by mistake.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-2.8.3/plugins/power/csd-power-manager.c
new/cinnamon-settings-daemon-2.8.4/plugins/power/csd-power-manager.c
--- old/cinnamon-settings-daemon-2.8.3/plugins/power/csd-power-manager.c
2015-11-26 21:29:41.000000000 +0100
+++ new/cinnamon-settings-daemon-2.8.4/plugins/power/csd-power-manager.c
2016-03-07 18:11:21.000000000 +0100
@@ -3444,6 +3444,8 @@
CSD_POWER_IDLETIME_BLANK_ID);
}
+ gboolean is_sleep_inhibited = idle_is_session_inhibited (manager,
+
SESSION_INHIBIT_MASK_SUSPEND);
/* only do the sleep timeout when the session is idle
* and we aren't inhibited from sleeping */
if (on_battery) {
@@ -3453,7 +3455,7 @@
timeout_sleep = g_settings_get_int (manager->priv->settings,
"sleep-inactive-ac-timeout");
}
- if (timeout_sleep != 0) {
+ if (!is_sleep_inhibited && timeout_sleep != 0) {
g_debug ("setting up sleep callback %is", timeout_sleep);
gpm_idletime_alarm_set (manager->priv->idletime,
