diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 19:04:00 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 19:40:45 +0100 |
| commit | 658d07e939261da0cb4835f03ab908e16540b57c (patch) | |
| tree | baa435d75f44f6747ccdfbe7471dc76baa3fc567 /debian/patches | |
| parent | 9674c43460e69eb88fa97f6b69911d61d0f767cd (diff) | |
| download | nx-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 'debian/patches')
| -rw-r--r-- | debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch | 47 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch deleted file mode 100644 index 129cb707e..000000000 --- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Prevent sending COMPOUND_TEXT - Do not send COMPOUND_TEXT to client. - . - Originally contributed by FreeNX Team (dimbor). -Forwarded: not-yet -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c -@@ -1226,10 +1226,11 @@ - 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, ---- a/nx-X11/programs/Xserver/hw/nxagent/Image.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c -@@ -644,6 +644,10 @@ - pDrawable -> depth != 1 && - nxagentOption(DeferLevel) >= 1) - { -+ /* -- changed by dimbor (small "bed-sheets" never need be prevented - always put) --*/ -+ if (dstHeight > 16) -+ { -+ /* -------------------------------------------------------------------------------- */ - #ifdef TEST - fprintf(stderr, "nxagentPutImage: WARNING! Prevented operation on region [%d,%d,%d,%d] " - "for drawable at [%p] with drawable pixmap.\n", pRegion -> extents.x1, -@@ -654,6 +658,9 @@ - nxagentMarkCorruptedRegion(pDrawable, pRegion); - - goto nxagentPutImageEnd; -+ /* --- changed by dimbor ---*/ -+ } -+ /* ------------------------- */ - } - - if (pDrawable -> type == DRAWABLE_WINDOW && diff --git a/debian/patches/series b/debian/patches/series index c0c34264a..7f8abfcba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch 108_nxagent_wine-close-delay.full.patch 110_nxagent_createpixmap-bounds-check.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch |