aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-08-24 15:59:36 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-08-24 15:59:36 +0200
commit0ea971b9ea9c8c3836535a0e9900d9283e42af5a (patch)
treebe01158236827ccfbdc013b0bc668fa1647f1156 /nx-X11/programs/Xserver
parent46fef31507fd2a5ba80fd3824bb00514497fc30f (diff)
parent2d450e383c8d31b9d638bf421cbfabc7a3cd5eb3 (diff)
downloadnx-libs-0ea971b9ea9c8c3836535a0e9900d9283e42af5a.tar.gz
nx-libs-0ea971b9ea9c8c3836535a0e9900d9283e42af5a.tar.bz2
nx-libs-0ea971b9ea9c8c3836535a0e9900d9283e42af5a.zip
Merge branch 'uli42-fix_x2go_952' into 3.6.x
Fixes X2GoBTS#952 Attributes GH PR #194: https://github.com/ArcticaProject/nx-libs/pull/194
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 1771d4c9d..72c772b43 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1583,6 +1583,14 @@ int nxagentInitClipboard(WindowPtr pWin)
nxagentXFixesInfo.Initialized = 1;
}
+ /*
+ The first paste from CLIPBOARD did not work directly after
+ session start. Removing this code makes it work. It is unsure why
+ it was introduced in the first place so it is possible that we
+ see other effects by leaving out this code.
+
+ Fixes X2Go bug #952, see https://bugs.x2go.org/952 for details .
+
if (nxagentSessionId[0])
{
#ifdef TEST
@@ -1595,6 +1603,7 @@ int nxagentInitClipboard(WindowPtr pWin)
pWin -> eventMask |= PropertyChangeMask;
nxagentChangeWindowAttributes(pWin, CWEventMask);
}
+ */
if (nxagentReconnectTrap)
{