diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
| commit | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (patch) | |
| tree | c76e9cb708483e65b114c08ed008880f478cae15 /xorg-server/Xext/saver.c | |
| parent | b16c0295c9f95426980d567e93ae00c52545b3fa (diff) | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.gz vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.bz2 vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/Xext/saver.c')
| -rw-r--r-- | xorg-server/Xext/saver.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c index 5cf426d61..298f09042 100644 --- a/xorg-server/Xext/saver.c +++ b/xorg-server/Xext/saver.c @@ -486,7 +486,6 @@ SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced) ScreenSaverEventPtr pEv;
unsigned long mask;
xScreenSaverNotifyEvent ev;
- ClientPtr client;
int kind;
UpdateCurrentTimeIf ();
@@ -505,20 +504,16 @@ SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced) kind = ScreenSaverInternal;
for (pEv = pPriv->events; pEv; pEv = pEv->next)
{
- client = pEv->client;
- if (client->clientGone)
- continue;
if (!(pEv->mask & mask))
continue;
ev.type = ScreenSaverNotify + ScreenSaverEventBase;
ev.state = state;
- ev.sequenceNumber = client->sequence;
ev.timestamp = currentTime.milliseconds;
ev.root = WindowTable[pScreen->myNum]->drawable.id;
ev.window = savedScreenInfo[pScreen->myNum].wid;
ev.kind = kind;
ev.forced = forced;
- WriteEventsToClient (client, 1, (xEvent *) &ev);
+ WriteEventsToClient (pEv->client, 1, (xEvent *) &ev);
}
}
@@ -1054,7 +1049,6 @@ ScreenSaverSetAttributes (ClientPtr client) }
else
{
- ret = (ret == BadValue) ? BadPixmap : ret;
client->errorValue = pixID;
goto PatchUp;
}
@@ -1092,7 +1086,6 @@ ScreenSaverSetAttributes (ClientPtr client) }
else
{
- ret = (ret == BadValue) ? BadPixmap : ret;
client->errorValue = pixID;
goto PatchUp;
}
@@ -1174,7 +1167,6 @@ ScreenSaverSetAttributes (ClientPtr client) client, DixUseAccess);
if (ret != Success)
{
- ret = (ret == BadValue) ? BadColor : ret;
client->errorValue = cmap;
goto PatchUp;
}
@@ -1198,7 +1190,6 @@ ScreenSaverSetAttributes (ClientPtr client) RT_CURSOR, client, DixUseAccess);
if (ret != Success)
{
- ret = (ret == BadValue) ? BadCursor : ret;
client->errorValue = cursorID;
goto PatchUp;
}
@@ -1287,7 +1278,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) XRT_PIXMAP, client,
DixReadAccess);
if (status != Success)
- return (status == BadValue) ? BadPixmap : status;
+ return status;
}
}
@@ -1299,7 +1290,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) XRT_PIXMAP, client,
DixReadAccess);
if (status != Success)
- return (status == BadValue) ? BadPixmap : status;
+ return status;
}
}
@@ -1311,7 +1302,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) XRT_COLORMAP, client,
DixReadAccess);
if (status != Success)
- return (status == BadValue) ? BadColor : status;
+ return status;
}
}
|