diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
| commit | c31ae1eed4d2a77e0962bee16279459cb5f7cd65 (patch) | |
| tree | 8b2a43fffc3d0c4498b804f32c8600baad629915 /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
| parent | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (diff) | |
| parent | 4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2 (diff) | |
| download | nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.gz nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.bz2 nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.zip | |
Merge branch 'sunweaver-pr/rrxinerama-vs-panoramix-with-disable-support' into 3.6.x
Attributes GH PR #135: https://github.com/ArcticaProject/nx-libs/pull/135
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Sat, 18 Jun 2016 05:25:08 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 20ec3672a..50d278ed7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1114,11 +1114,6 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, nxagentChangeOption(ViewportXSpan, nxagentOption(Width) - nxagentOption(RootWidth)); nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - nxagentOption(RootHeight)); - /* PanoramiXExtension enabled via cmdline, turn on Xinerama in nxagent - */ - if( (!noPanoramiXExtension) && (!PanoramiXExtensionDisabledHack) ) - nxagentOption(Xinerama) = True; - if (nxagentReconnectTrap == 0) { if (nxagentOption(Persistent)) |