[gnome-session: 2/2] Merge branch 'wip/xiaoguang/idle_watch_on_screensaver' into 'master'

[Ray Strode <halfline src gnome org>]

commit ca36ed86159caae994dfaa1825f6fc3f77664b2d
Merge: ad610f8f 40377373
Author: Ray Strode <halfline gmail com>
Date:   Fri Jul 19 14:03:54 2019 +0000

    Merge branch 'wip/xiaoguang/idle_watch_on_screensaver' into 'master'
    
    presence: Enable idle detection while screensaver is active
    
    See merge request GNOME/gnome-session!10

 gnome-session/gsm-presence.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
---