From 2d450e383c8d31b9d638bf421cbfabc7a3cd5eb3 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 21 Aug 2016 13:12:23 +0200 Subject: Fix pasting the clipboard directly after session start. --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'nx-X11/programs/Xserver/hw') 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) { -- cgit v1.2.3