From 9691d196c34d551ebc33843692afd0ee23b9389b Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 27 Apr 2010 13:04:40 +0000 Subject: svn merge -r549:HEAD "^/branches/released" . --- xorg-server/dix/events.c | 1 - xorg-server/dix/main.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'xorg-server/dix') diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 1d0d5b280..bfe6a8c42 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -5358,7 +5358,6 @@ ProcGrabButton(ClientPtr client) rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) - if (!cursor) { client->errorValue = stuff->cursor; return (rc == BadValue) ? BadCursor : rc; diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 54cd8a919..923dbe99a 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -205,9 +205,7 @@ int main(int argc, char *argv[], char *envp[]) ScreenSaverBlanking = defaultScreenSaverBlanking; ScreenSaverAllowExposures = defaultScreenSaverAllowExposures; #ifdef DPMSExtension - DPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME; - DPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME; - DPMSOffTime = DEFAULT_SCREEN_SAVER_TIME; + DPMSStandbyTime = DPMSSuspendTime = DPMSOffTime = ScreenSaverTime; DPMSEnabled = TRUE; DPMSPowerLevel = 0; #endif -- cgit v1.2.3