Commit 25cbfd14 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Clipboard.c: merge endTransfer and nxagentSendSelectionNotify

endTransfer is the only caller
parent 7d068370
......@@ -201,7 +201,6 @@ XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 };
extern Display *nxagentDisplay;
Bool nxagentValidServerTargets(Atom target);
void nxagentSendSelectionNotify(Atom property);
static void endTransfer(Bool success);
#define SELECTION_SUCCESS True
#define SELECTION_FAULT False
......@@ -737,7 +736,13 @@ FIXME: Do we need this?
nxagentPrintClipboardStat("after nxagentRequestSelection");
}
void nxagentSendSelectionNotify(Atom property)
/*
* client and resetting the corresponding variables and the state
* machine. If success is False send a None reply, meaning "request
* denied/failed"
* Use SELECTION_SUCCESS and SELECTION_FAULT macros for success.
*/
static void endTransfer(Bool success)
{
if (lastClientClientPtr == NULL)
{
......@@ -752,25 +757,7 @@ void nxagentSendSelectionNotify(Atom property)
lastClientRequestor,
lastClientSelection,
lastClientTarget,
property);
}
/*
* client and resetting the corresponding variables and the state
* machine. If success is False send a None reply, meaning "request
* denied/failed"
* Use SELECTION_SUCCESS and SELECTION_FAULT macros for success.
*/
static void endTransfer(Bool success)
{
if (success == SELECTION_SUCCESS)
{
nxagentSendSelectionNotify(lastClientProperty);
}
else
{
nxagentSendSelectionNotify(None);
}
success == SELECTION_SUCCESS ? lastClientProperty : None);
/*
* Enable further requests from clients.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment