aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-06-18 00:21:41 +0200
committerUlrich Sibiller <uli42@gmx.de>2021-06-21 22:23:51 +0200
commit289ac3dfd3b0f9bcefff15eb80dd04dccb0a1051 (patch)
tree1a6250bcd2cf81b57ffacafe603e11e0b2402b5e
parent30e9b82cef50c55e64db5ad656dbdf4a5056467c (diff)
downloadnx-libs-289ac3dfd3b0f9bcefff15eb80dd04dccb0a1051.tar.gz
nx-libs-289ac3dfd3b0f9bcefff15eb80dd04dccb0a1051.tar.bz2
nx-libs-289ac3dfd3b0f9bcefff15eb80dd04dccb0a1051.zip
Clipboard.c: remove superflous check
replyPendingRequestSelectionToXServer already checks for None
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 392943066..735a9379a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2327,21 +2327,13 @@ static void setSelectionOwnerOnXServer(Selection *pSelection)
lastSelectionOwner[index].lastTimeChanged);
#endif
- #if defined(TEST) || defined(DEBUG)
- if (lastServers[index].requestor != None)
- {
- /*
- * There's an X client on the real X server waiting for a
- * reply. That reply will never come because now we are the
- * owner so let's be fair and cancel that request.
- */
- fprintf(stderr, "%s: WARNING! lastServers[%d].requestor window [0x%lx] already set. Cancelling pending request.\n",
- __func__, index, lastServers[index].requestor);
- replyPendingRequestSelectionToXServer(index, False);
- /* Now we can go on. */
- }
- #endif
+ /*
+ * There's an X client on the real X server waiting for a
+ * reply. That reply will never come because now we are the
+ * owner so let's be fair and cancel that request.
+ */
+ replyPendingRequestSelectionToXServer(index, False);
/*
* Inform the real X server that our serverWindow is the