diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
| commit | db7feaf9883bb0dc419593588036405ef12ebca1 (patch) | |
| tree | 1a911fe1a08aed78845e17b5350c9238452a12dd /nx-X11/programs/Xserver/Xext | |
| parent | e77bf36d9afbc7e56522574b06217d57c11dd095 (diff) | |
| download | nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.gz nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.bz2 nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.zip | |
Revert "release 3.5.0.19"
This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/panoramiX.c | 9 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/panoramiX.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/security.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index a1a5b9f1f..33faedc57 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -1045,7 +1045,16 @@ 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. */ + extern Bool PanoramiXExtensionDisabledHack; + rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack; + } +#else rep.state = !noPanoramiXExtension; +#endif if (client->swapped) { register int n; swaps (&rep.sequenceNumber, n); diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.h b/nx-X11/programs/Xserver/Xext/panoramiX.h index 4178b985f..5fa4ed35c 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.h +++ b/nx-X11/programs/Xserver/Xext/panoramiX.h @@ -44,7 +44,7 @@ Equipment Corporation. #define _PANORAMIX_H_ #include <X11/extensions/panoramiXext.h> -/*#include "gcstruct.h"*/ +#include "gcstruct.h" typedef struct _PanoramiXData { diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index fc3bb99e6..2139425b4 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -86,7 +86,7 @@ extern unsigned char LbxReqCode; #ifdef NXAGENT_SERVER -#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy" +#define NX_ALTERNATIVEPOLICYFILE "/usr/lib/xserver/SecurityPolicy" #endif |