svn merge "^/branches/released" .

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;

            }

        }