[PATCH 07/15] os: xinerama: remove hack and undocumented -disablexineramaextension option

[Tiago Vignatti]

We are not supposed to hack the server to address client issues (see bug #1846
for more details). This reverts commit cdc15e22.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 Xext/panoramiX.c  |    8 --------
 include/globals.h |    4 ----
 os/utils.c        |    7 -------
 3 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index b73c53f..b7c5191 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -1014,15 +1014,7 @@ ProcXineramaIsActive(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-#if 1
-    {
-	/* The following hack fools clients into thinking that Xinerama
-	 * is disabled even though it is not. */
-	rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
-    }
-#else
     rep.state = !noPanoramiXExtension;
-#endif
     if (client->swapped) {
 	int n;
 	swaps (&rep.sequenceNumber, n);
diff --git a/include/globals.h b/include/globals.h
index 8b80a65..bcb94e0 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -34,10 +34,6 @@ extern _X_EXPORT Bool DPMSDisabledSwitch;
 extern _X_EXPORT Bool DPMSCapableFlag;
 #endif
 
-#ifdef PANORAMIX
-extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
-#endif
-
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
diff --git a/os/utils.c b/os/utils.c
index 8ed0c7c..3a747ad 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -195,10 +195,6 @@ Bool noGEExtension = FALSE;
 
 Bool CoreDump;
 
-#ifdef PANORAMIX
-Bool PanoramiXExtensionDisabledHack = FALSE;
-#endif
-
 int auditTrailLevel = 1;
 
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
@@ -858,9 +854,6 @@ ProcessCommandLine(int argc, char *argv[])
 	else if ( strcmp( argv[i], "-xinerama") == 0){
 	    noPanoramiXExtension = FALSE;
 	}
-	else if ( strcmp( argv[i], "-disablexineramaextension") == 0){
-	    PanoramiXExtensionDisabledHack = TRUE;
-	}
 #endif
 	else if ( strcmp( argv[i], "-I") == 0)
 	{
-- 
1.7.0.4