[X2Go-Commits] [nx-libs] 420/429: NXdispatch.c: add an explaining comment

[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 15ee25b7dd259793b335723c5f66ff14054c72d0
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Jun 22 21:41:10 2021 +0200

    NXdispatch.c: add an explaining comment
    
    and restructure a bit.
---
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index ff8330cc7..5df008bbb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -745,10 +745,15 @@ ProcConvertSelection(register ClientPtr client)
 	while ((i < NumCurrentSelections) && 
 	       CurrentSelections[i].selection != stuff->selection) i++;
 	if ((i < NumCurrentSelections) &&
-#ifdef NXAGENT_SERVER
-	    (CurrentSelections[i].window != None) && (CurrentSelections[i].client != NullClient)
-#else
 	    (CurrentSelections[i].window != None)
+#ifdef NXAGENT_SERVER
+            /*
+             * .window can be set and pointing to our server window to
+             * signal the clipboard owner being on the real X
+             * server. Therefore we need to check .client in addition
+             * to ensure having a local owner.
+             */
+	    && (CurrentSelections[i].client != NullClient)
 #endif
 #ifdef XCSECURITY
 	    && (!client->CheckAccess ||

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git