xserver/hw/xnest Screen.c,3.14,3.15

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/xnest
In directory gabe:/tmp/cvs-serv19283/hw/xnest

Modified Files:
	Screen.c 
Log Message:
2005-03-01  Keith Packard  <keithp at keithp.com>

	* composite/compinit.c: (compScreenInit):
	Disable Composite extension on servers without
	GetWindowPixmap and SetWindowPixmap (e.g. Xnest)
	
	* hw/xnest/Screen.c: (xnestOpenScreen):
	Disable shared memory pixmaps.


Index: Screen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Screen.c,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -d -r3.14 -r3.15
--- Screen.c	4 Feb 2004 15:51:20 -0000	3.14
+++ Screen.c	2 Mar 2005 05:29:57 -0000	3.15
@@ -214,6 +214,10 @@
 	       numDepths, depths,
 	       visuals[xnestDefaultVisualIndex].vid, /* root visual */
 	       numVisuals, visuals);
+#ifdef MITSHM
+  ShmRegisterFuncs(pScreen, 0);
+#endif
+    
 
   miInitializeBackingStore(pScreen);