aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Shneyder <o.shneyder@phoca-gmbh.de>2015-02-10 19:32:12 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:56 +0100
commit35aab85c79200d861c906b691bf8b6be99d58590 (patch)
treeb76b1e89238b0d6e117557c61fb5ea2b36b44b24
parentdb870556433fd737640f7038e0583242724e2d52 (diff)
downloadnx-libs-35aab85c79200d861c906b691bf8b6be99d58590.tar.gz
nx-libs-35aab85c79200d861c906b691bf8b6be99d58590.tar.bz2
nx-libs-35aab85c79200d861c906b691bf8b6be99d58590.zip
Fix refresh errors on Win2012 RDP connections with speed=ADS (205_nxagent_refresh-adsl.full.patch).
-rw-r--r--debian/patches/205_nxagent_refresh-adsl.full.patch14
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/GCOps.c2
3 files changed, 1 insertions, 16 deletions
diff --git a/debian/patches/205_nxagent_refresh-adsl.full.patch b/debian/patches/205_nxagent_refresh-adsl.full.patch
deleted file mode 100644
index 4840ea7ce..000000000
--- a/debian/patches/205_nxagent_refresh-adsl.full.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix refresh errors on Win2012 RDP connections with speed=ADSL
-Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
-diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
---- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c 2014-05-06 12:52:35.082288455 +0200
-+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c 2014-05-06 12:54:00.258710819 +0200
-@@ -339,7 +339,7 @@ FIXME: The popup could be synchronized w
- */
-
- if ((pDstDrawable -> type == DRAWABLE_PIXMAP &&
-- nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 2)
-+ nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 3)
- {
- pClipRegion = nxagentCreateRegion(pSrcDrawable, NULL, srcx, srcy,
- width, height);
diff --git a/debian/patches/series b/debian/patches/series
index 82d5eb9aa..4bbe897df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-205_nxagent_refresh-adsl.full.patch
206_nxagent_clipboard-as-nxoption.full.patch
207_nxagent_fix-xfixes-selection.full.patch
209_x2goagent_add-man-page.full.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index e18b034eb..c489d12c4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -339,7 +339,7 @@ FIXME: The popup could be synchronized with one
*/
if ((pDstDrawable -> type == DRAWABLE_PIXMAP &&
- nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 2)
+ nxagentOption(DeferLevel) > 0) || nxagentOption(DeferLevel) >= 3)
{
pClipRegion = nxagentCreateRegion(pSrcDrawable, NULL, srcx, srcy,
width, height);