aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:04:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:45 +0100
commit658d07e939261da0cb4835f03ab908e16540b57c (patch)
treebaa435d75f44f6747ccdfbe7471dc76baa3fc567 /nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
parent9674c43460e69eb88fa97f6b69911d61d0f767cd (diff)
downloadnx-libs-658d07e939261da0cb4835f03ab908e16540b57c.tar.gz
nx-libs-658d07e939261da0cb4835f03ab908e16540b57c.tar.bz2
nx-libs-658d07e939261da0cb4835f03ab908e16540b57c.zip
Prevent sending COMPOUND_TEXT (107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch).
Do not send COMPOUND_TEXT to client. Originally contributed by FreeNX Team (dimbor).
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index d17f154cd..2e409e41c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1226,10 +1226,11 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
Atom xa_STRING[4];
xEvent x;
+ /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */
xa_STRING[0] = XA_STRING;
- xa_STRING[1] = clientTEXT;
- xa_STRING[2] = clientCOMPOUND_TEXT;
- xa_STRING[3] = clientUTF8_STRING;
+ xa_STRING[1] = clientUTF8_STRING;
+ xa_STRING[2] = clientTEXT;
+ xa_STRING[3] = clientCOMPOUND_TEXT;
ChangeWindowProperty(pWin,
property,