[X2Go-Commits] [nx-libs] 15/24: Fix refresh errors on Win2012 RDP connections with speed=ADS (205_nxagent_refresh-adsl.full.patch).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 35aab85c79200d861c906b691bf8b6be99d58590
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Tue Feb 10 19:32:12 2015 +0100

    Fix refresh errors on Win2012 RDP connections with speed=ADS (205_nxagent_refresh-adsl.full.patch).
---
 debian/patches/205_nxagent_refresh-adsl.full.patch |   14 --------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c         |    2 +-
 3 files changed, 1 insertion(+), 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 4840ea7..0000000
--- 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 at 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 82d5eb9..4bbe897 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 e18b034..c489d12 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);

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git