[X2Go-Commits] [nx-libs] 400/429: Clipboard.c: remove old code

[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 9fb5949b017b50e55a93dcd200cafffb7602ef21
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jun 11 00:15:20 2021 +0200

    Clipboard.c: remove old code
    
    This block has been unused for a long time now. The comment describing
    how to reach that path does not make sense anymore because primary and
    clipboard are not sharing variables anymore. So drop it.
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 31 --------------------------
 1 file changed, 31 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 3a210ac5f..503f42add 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1257,37 +1257,6 @@ void nxagentHandleSelectionRequestFromXServer(XEvent *X)
    */
   serverLastRequestedSelection = X->xselectionrequest.selection;
 
-#if 0
-  if (lastClients[index].windowPtr != NULL && IS_LOCAL_OWNER(index))
-  {
-    /*
-     * Request the real X server to transfer the selection content
-     * to the NX_CUT_BUFFER_SERVER property of the serverWindow.
-     * We reach here as follows:
-     * - mark someting in the nx session
-     *   -> nxagent claims ownership of PRIMARY on real X server
-     * - at the same time paste _clipboard_ to the client (now) owning primary
-     *   ->vcxsrv will ask for primary contents to store them to Windows clipboard
-     * - vcxsrv request is for _primary_ and takes this path as the _clipboard_ transfer
-     * has set lastClients[index].windowPtr
-     */
-    XDeleteProperty(nxagentDisplay, serverWindow, serverTransToAgentProperty);
-    XConvertSelection(nxagentDisplay, CurrentSelections[index].selection,
-                          X->xselectionrequest.target, serverTransToAgentProperty,
-                              serverWindow, lastClients[index].time);
-
-    NXFlushDisplay(nxagentDisplay, NXFlushLink);
-
-    #ifdef DEBUG
-    fprintf(stderr, "%s: Sent XConvertSelection: selection [%d][%s] target [%ld][%s] property [%ld][%s] window [0x%lx] time [%u] .\n", __func__,
-                CurrentSelections[index].selection, NameForRemoteAtom(CurrentSelections[index].selection)),
-                    X->xselectionrequest.target, NameForRemoteAtom(X->xselectionrequest.target),
-                        serverTransToAgentProperty, NameForRemoteAtom(serverTransToAgentProperty),
-                            serverWindow, lastClients[index].time);
-    #endif
-  }
-  else
-#endif
   {
     if (!(nxagentOption(Clipboard) == ClipboardServer ||
           nxagentOption(Clipboard) == ClipboardBoth))

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