xserver: Branch 'server-1.4-branch' - 2 commits

[Daniel Stone]

 Xext/dpms.c                  |    7 +++++--
 hw/xfree86/common/xf86Priv.h |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 33a9ee9ba0ab44548afafa965bbd0a715cb1509c
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 aced406..0557523 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -200,12 +200,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);
 }
commit a08f848d4cd4c8c6e055a1182542d053a0a32c6b
Author: Adam Jackson <ajax at aspartame.nwnk.net>
Date:   Sun Nov 18 11:57:01 2007 -0500

    Bump DEFAULT_DPI to 96.
    
    75 is just nonsense.
    (cherry picked from commit db9ae863536fff80b5463d99e71dc47ae587980d)

diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index b6fbd3a..5a3cba3 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -119,7 +119,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
 #define DEFAULT_LOG_VERBOSE	3
 #endif
 #ifndef DEFAULT_DPI
-#define DEFAULT_DPI		75
+#define DEFAULT_DPI		96
 #endif
 
 #define DEFAULT_UNRESOLVED	TRUE