diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-11-17 17:30:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:36:02 +0100 |
| commit | cc01d49929f3d1ada9184a07f16184a50aa9ebd6 (patch) | |
| tree | 04712aeeafbbca9c9486b8b5b97b4967cd30b521 /nx-X11/programs/Xserver/hw | |
| parent | ffce5337d8a682a1ac88476cdda074c8a5109247 (diff) | |
| download | nx-libs-cc01d49929f3d1ada9184a07f16184a50aa9ebd6.tar.gz nx-libs-cc01d49929f3d1ada9184a07f16184a50aa9ebd6.tar.bz2 nx-libs-cc01d49929f3d1ada9184a07f16184a50aa9ebd6.zip | |
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...
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 5 | ||||
| -rw-r--r-- | 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 |