[X2Go-Commits] [nx-libs] 405/429: Clipboard.c: Fix: forward the correct type and format

[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 e65e715129ddbefaf2ebb4b14a803b312632705e
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Jun 14 23:59:05 2021 +0200

    Clipboard.c: Fix: forward the correct type and format
    
    now stuff like xclip -o -t LENGTH works (if the owner offers that)
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index bb1656d7f..ba26f0915 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1774,7 +1774,7 @@ Bool nxagentCollectPropertyEventFromXServer(int resource)
           {
             ChangeWindowProperty(lastClients[index].windowPtr,
                                  lastClients[index].property,
-                                 lastClients[index].target,
+                                 nxagentRemoteToLocalAtom(atomReturnType),
                                  resultFormat, PropModeReplace,
                                  ulReturnItems, pszReturnData, 1);
 
@@ -2043,12 +2043,11 @@ void handlePropertyTransferFromAgentToXserver(int index, XlibAtom property)
           /* Fill the property on the requestor with the requested data. */
           /* The XChangeProperty source code reveals it will always
              return 1, no matter what, so no need to check the result */
-          /* FIXME: better use the format returned by above request. */
           XChangeProperty(nxagentDisplay,
                           lastServers[index].requestor,
                           lastServers[index].property,
-                          lastServers[index].target,
-                          8,
+                          nxagentLocalToRemoteAtom(atomReturnType),
+                          resultFormat,
                           PropModeReplace,
                           pszReturnData,
                           ulReturnItems);

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