diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
| commit | 9691d196c34d551ebc33843692afd0ee23b9389b (patch) | |
| tree | 184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/dix | |
| parent | f49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff) | |
| download | vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2 vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip | |
svn merge -r549:HEAD "^/branches/released" .
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 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
|