svn merge "^/branches/released" .

2 files changed, 3 insertions, 8 deletions

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index fae8d8b5d..0b7d62dca 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -436,7 +436,7 @@ ProcXDGAInstallColormap(ClientPtr client)
     rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP,

 				 client, DixInstallAccess);

     if (rc != Success)

-        return (rc == BadValue) ? BadColor : rc;

+        return rc;

     DGAInstallCmap(cmap);

     return Success;

 }

@@ -878,7 +878,7 @@ ProcXF86DGAInstallColormap(ClientPtr client)
 	DGAInstallCmap(pcmp);

         return Success;

     } else {

-        return (rc == BadValue) ? BadColor : rc;

+        return rc;

     }

 }

 

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
index 483b92ab1..f29f5bad2 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -331,7 +331,6 @@ SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
     XF86VidModeEventPtr		pEv;

     unsigned long		mask;

     xXF86VidModeNotifyEvent	ev;

-    ClientPtr			client;

     int				kind;

 

     UpdateCurrentTimeIf ();

@@ -343,19 +342,15 @@ SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
     kind = XF86VidModeModeChange;

     for (pEv = pPriv->events; pEv; pEv = pEv->next)

     {

-	client = pEv->client;

-	if (client->clientGone)

-	    continue;

 	if (!(pEv->mask & mask))

 	    continue;

 	ev.type = XF86VidModeNotify + XF86VidModeEventBase;

 	ev.state = state;

-	ev.sequenceNumber = client->sequence;

 	ev.timestamp = currentTime.milliseconds;

 	ev.root = WindowTable[pScreen->myNum]->drawable.id;

 	ev.kind = kind;

 	ev.forced = forced;

-	WriteEventsToClient (client, 1, (xEvent *) &ev);

+	WriteEventsToClient (pEv->client, 1, (xEvent *) &ev);

     }

 }