From cc01d49929f3d1ada9184a07f16184a50aa9ebd6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 17 Nov 2019 17:30:14 +0100 Subject: Clipboard.c, NXproperty.c: match prototypes The prototype for nxagentGetClipboardWindow has been changed in 63320437ed4e95246ce62193560098f986ac265c but the changes have not made it into NXproperty.c... --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 5 +++++ nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 1279848fc..ca9c32486 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -2033,6 +2033,11 @@ int nxagentSendNotify(xEvent *event) return 0; } +/* + * This is called from NXproperty.c to determine if a client sets the + * property we are waiting for. + * FIXME: in addition we should check if the client is the one we expect + */ WindowPtr nxagentGetClipboardWindow(Atom property) { int i = nxagentFindLastSelectionOwnerIndex(nxagentLastRequestedSelection); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 9799d80d5..cc10ad760 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -94,7 +94,7 @@ nxagentWMStateRec; #undef DEBUG #ifdef NXAGENT_CLIPBOARD -extern WindowPtr nxagentGetClipboardWindow(Atom, WindowPtr); +extern WindowPtr nxagentGetClipboardWindow(Atom); #endif #ifdef NXAGENT_ARTSD @@ -135,7 +135,7 @@ ProcChangeProperty(ClientPtr client) REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize); #ifdef NXAGENT_CLIPBOARD - pWin = nxagentGetClipboardWindow(stuff->property, NULL); + pWin = nxagentGetClipboardWindow(stuff->property); if (pWin == NULL) #endif -- cgit v1.2.3