diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-05 16:36:10 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:44:08 +0200 |
| commit | 63320437ed4e95246ce62193560098f986ac265c (patch) | |
| tree | fd27346b88f29b0f9d1f25ac3a6fdf9240fac0a4 | |
| parent | 1d05784b44c03fc136b5b446352fbe79184bb7d9 (diff) | |
| download | nx-libs-63320437ed4e95246ce62193560098f986ac265c.tar.gz nx-libs-63320437ed4e95246ce62193560098f986ac265c.tar.bz2 nx-libs-63320437ed4e95246ce62193560098f986ac265c.zip | |
Clipboard.c: simplify nxagentGetClipboardWindow
The second parameter was always NULL, so remove it. Also remove some
debugging output which distracts while debugging as the function is
called from ProcChangeProperty for _every_ property, also non-clipboard
related ones.
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 2f04d2960..c99c5f030 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -208,7 +208,7 @@ static void endTransfer(Bool success); void nxagentTransferSelection(int resource); void nxagentCollectPropertyEvent(int resource); void nxagentResetSelectionOwner(void); -WindowPtr nxagentGetClipboardWindow(Atom property, WindowPtr pWin); +WindowPtr nxagentGetClipboardWindow(Atom property); void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, Atom selection, Atom target, Time time); int nxagentSendNotify(xEvent *event); @@ -1667,12 +1667,8 @@ int nxagentSendNotify(xEvent *event) return 0; } -WindowPtr nxagentGetClipboardWindow(Atom property, WindowPtr pWin) +WindowPtr nxagentGetClipboardWindow(Atom property) { - #ifdef DEBUG - fprintf(stderr, "%s: Got called, property [%d][%s] window [%p].\n", __func__, property, NameForAtom(property), (void *)pWin); - #endif - int i = nxagentFindLastSelectionOwnerIndex(nxagentLastRequestedSelection); if ((i < nxagentMaxSelections) && (property == clientCutProperty) && @@ -1686,13 +1682,8 @@ WindowPtr nxagentGetClipboardWindow(Atom property, WindowPtr pWin) } else { - #ifdef DEBUG - fprintf(stderr, "%s: Returning original target window [%p].\n", __func__, (void *)pWin); - #endif - - return pWin; + return NULL; } - } int nxagentInitClipboard(WindowPtr pWin) |