[PATCH v2 1/4] composite: Call ValidateGC after ChangeGC

[ville.syrjala at nokia.com]

From: Ville Syrjälä <ville.syrjala at nokia.com>

ChangeGC changes the GC, so ValidateGC should be called after it, not
before.

Signed-off-by: Ville Syrjälä <ville.syrjala at nokia.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
---
 composite/compalloc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 246e4c5..1138b9a 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -500,9 +500,8 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
 	{
 	    ChangeGCVal val;
 	    val.val = IncludeInferiors;
-	    
+	    ChangeGC (NullClient, pGC, GCSubwindowMode, &val);
 	    ValidateGC(&pPixmap->drawable, pGC);
-	    ChangeGC (serverClient, pGC, GCSubwindowMode, &val);
 	    (*pGC->ops->CopyArea) (&pParent->drawable,
 				   &pPixmap->drawable,
 				   pGC,
-- 
1.7.2.2