Clipboard.c, NXproperty.c: match prototypes

The prototype for nxagentGetClipboardWindow has been changed in 63320437 but the changes have not made it into NXproperty.c...

Clipboard.c, NXproperty.c: match prototypes
cc01d499 · Ulrich Sibiller · Mike Gabriel · ffce5337 · cc01d499 · cc01d499
Commit cc01d499 authored Nov 17, 2019 by Ulrich Sibiller Committed by Mike Gabriel Jan 05, 2020
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Clipboard.c nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +5 -0

NXproperty.c nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +2 -2

No files found.
--- 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);

--- 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