diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-27 12:17:43 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-27 12:17:43 +0000 |
| commit | 929c7e1e824590c2f8bd47135f96c98a34027dd5 (patch) | |
| tree | 6276192c5c4b18aaab2eccbc03b8d6e1b859ab1b /xorg-server/dix | |
| parent | e026745845d87ab4cd8b2a96b665d24b025644e1 (diff) | |
| download | vcxsrv-929c7e1e824590c2f8bd47135f96c98a34027dd5.tar.gz vcxsrv-929c7e1e824590c2f8bd47135f96c98a34027dd5.tar.bz2 vcxsrv-929c7e1e824590c2f8bd47135f96c98a34027dd5.zip | |
git update 27/4/2010
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/events.c | 1 | ||||
| -rw-r--r-- | xorg-server/dix/main.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 6d0137da4..b26e28af7 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -5355,7 +5355,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 f0235364f..b500ad767 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -161,9 +161,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 |