summaryrefslogtreecommitdiff
path: root/mate-session
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-07 13:49:36 +0100
committerinfirit <[email protected]>2014-11-07 14:31:52 +0100
commit1deaea538427f2dc9d3afdc37b9daf57c15a46cd (patch)
tree86f51a68473a4feeb915ae25c0b9d6f7257b6ee6 /mate-session
parent0da2caff6cb73d8dcd159fbeb37da60ad33c6003 (diff)
downloadmate-session-manager-1deaea538427f2dc9d3afdc37b9daf57c15a46cd.tar.bz2
mate-session-manager-1deaea538427f2dc9d3afdc37b9daf57c15a46cd.tar.xz
gsm: Refuse to install an idle timeout of 0 seconds
This was making gnome-screensaver fade and blank the screen as soon as you stopped moving the mouse/using the keyboard when the timeout is set to 0. Based on gnome-session commit: be627c10409129408e135925d5dd83ae2d554fa0 From: Rodrigo Moya <[email protected]> Original bug: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/863038
Diffstat (limited to 'mate-session')
-rw-r--r--mate-session/gsm-presence.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mate-session/gsm-presence.c b/mate-session/gsm-presence.c
index 8e16639..f87948d 100644
--- a/mate-session/gsm-presence.c
+++ b/mate-session/gsm-presence.c
@@ -167,7 +167,8 @@ reset_idle_watch (GsmPresence *presence)
}
if (! presence->priv->screensaver_active
- && presence->priv->idle_enabled) {
+ && presence->priv->idle_enabled
+ && presence->priv->idle_timeout > 0) {
g_debug ("GsmPresence: adding idle watch");
presence->priv->idle_watch_id = gs_idle_monitor_add_watch (presence->priv->idle_monitor,