Created attachment 187479 [details] [review]
Stop screensaver from automatically requesting unlock on unobscure event

To fix Bug #339330, William Jon McCann created a patch that, among other things, introduced the function static void window_obscured_cb(...) into gs-manager.c.  This function is called when the screensaver window is obscured (i.e., when fast user switching swaps to another VT) or unobscured (i.e., switching back to the VT).

In addition to attempting to disable or re-enable the screensaver animation, when the screensaver is unobscured, it automatically makes a request to unlock the screen, saving the user from having to wave their mouse around or do some other thing to bring up the unlock dialog.

My problem is that, for reasons I do not understand, my screensaver thinks, every time it activates due to session timeout, that its window is obscured briefly.  window_obscured_cb is called twice in rapid succession, once for obscure, then again for unobscure.  Because I do not use the screensaver lock feature, this means that, on the unobscure call, the screensaver is deactivated.  Thus, my screensaver will never activate due to a session timeout.

I have verified that the obscured window event is the reason for the screensaver deactivation using the debugging output.

I have attached a patch that fixes the problem by removing the line that requests screensaver unlock automatically as a result of an unobscure event.