aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-02-09 19:09:21 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:35 +0200
commit8fe2c114084743e8726ae39089e3aa1491d22719 (patch)
tree5049deb05b33b5c2d63847074dd787bb4572e6ce /nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
parent906aa0714de9f2aa2b9d2600d44658864cce0070 (diff)
downloadnx-libs-8fe2c114084743e8726ae39089e3aa1491d22719.tar.gz
nx-libs-8fe2c114084743e8726ae39089e3aa1491d22719.tar.bz2
nx-libs-8fe2c114084743e8726ae39089e3aa1491d22719.zip
Use NXAGENT_ONSTART define at more locations
marking all the code that is not really required when not using nomachine's nxclient.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 8ac2241a6..22fc96f4f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2237,6 +2237,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
nxagentXFixesInfo.Initialized = True;
}
+#ifdef NXAGENT_ONSTART
/*
The first paste from CLIPBOARD did not work directly after
session start. Removing this code makes it work. It is unsure why
@@ -2247,6 +2248,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
if (nxagentSessionId[0])
{
+ // nxagentAtoms[10] is the CLIPBOARD atom
#ifdef TEST
fprintf(stderr, "%s: setting the ownership of %s to %lx"
" and registering for PropertyChangeMask events\n", __func__,
@@ -2258,6 +2260,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
nxagentChangeWindowAttributes(pWin, CWEventMask);
}
*/
+#endif
if (nxagentReconnectTrap)
{