xserver: Branch 'master'

[Adam Jackson]

 hw/xnest/Args.c |    7 +++++++
 1 files changed, 7 insertions(+)

New commits:
diff-tree bdec9680fa74dd23cf319d09af1940f8cf71a5b1 (from 9f2a108051aad9b024ab737b45fc12290a113e37)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Wed Aug 23 14:43:23 2006 -0400

    Make sure Composite is never enabled for Xnest.

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 0aa0ca4..5d0a0c0 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -58,6 +58,13 @@ void ddxInitGlobals(void)
 int
 ddxProcessArgument (int argc, char *argv[], int i)
 {
+
+#ifdef COMPOSITE
+    /* XXX terrible hack */
+    extern Bool noCompositeExtension;
+    noCompositeExtension = TRUE;
+#endif
+
   if (!strcmp(argv[i], "-display")) {
     if (++i < argc) {
       xnestDisplayName = argv[i];