xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 Xext/dpms.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fdf927c2cdd1b92f0774f977d3195532294715d7
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 24 12:22:19 2008 -0400

    Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
    (cherry picked from commit 536f2ff5382aaaace3b55481e15366bb15d87801)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 6f01fa3..e3204fe 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -188,12 +188,15 @@ static int
 ProcDPMSEnable(client)
     register ClientPtr client;
 {
-    /* REQUEST(xDPMSEnableReq); */
+    Bool was_enabled = DPMSEnabled;
 
     REQUEST_SIZE_MATCH(xDPMSEnableReq);
 
-    if (DPMSCapableFlag)
+    if (DPMSCapableFlag) {
 	DPMSEnabled = TRUE;
+	if (!was_enabled)
+	    SetScreenSaverTimer();
+    }
 
     return(client->noClientException);
 }