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 }; ...@@ -201,7 +201,6 @@ XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 };
extern Display *nxagentDisplay; extern Display *nxagentDisplay;
Bool nxagentValidServerTargets(Atom target); Bool nxagentValidServerTargets(Atom target);
void nxagentSendSelectionNotify(Atom property);
static void endTransfer(Bool success); static void endTransfer(Bool success);
#define SELECTION_SUCCESS True #define SELECTION_SUCCESS True
#define SELECTION_FAULT False #define SELECTION_FAULT False
...@@ -737,24 +736,6 @@ FIXME: Do we need this? ...@@ -737,24 +736,6 @@ FIXME: Do we need this?
nxagentPrintClipboardStat("after nxagentRequestSelection"); nxagentPrintClipboardStat("after nxagentRequestSelection");
} }
void nxagentSendSelectionNotify(Atom property)
{
if (lastClientClientPtr == NULL)
{
#ifdef DEBUG
fprintf(stderr, "%s: lastClientClientPtr is NULL - doing nothing.\n", __func__);
#endif
return;
}
SendSelectionNotifyEventToClient(lastClientClientPtr,
lastClientTime,
lastClientRequestor,
lastClientSelection,
lastClientTarget,
property);
}
/* /*
* client and resetting the corresponding variables and the state * client and resetting the corresponding variables and the state
* machine. If success is False send a None reply, meaning "request * machine. If success is False send a None reply, meaning "request
...@@ -763,15 +744,21 @@ void nxagentSendSelectionNotify(Atom property) ...@@ -763,15 +744,21 @@ void nxagentSendSelectionNotify(Atom property)
*/ */
static void endTransfer(Bool success) static void endTransfer(Bool success)
{ {
if (success == SELECTION_SUCCESS) if (lastClientClientPtr == NULL)
{
nxagentSendSelectionNotify(lastClientProperty);
}
else
{ {
nxagentSendSelectionNotify(None); #ifdef DEBUG
fprintf(stderr, "%s: lastClientClientPtr is NULL - doing nothing.\n", __func__);
#endif
return;
} }
SendSelectionNotifyEventToClient(lastClientClientPtr,
lastClientTime,
lastClientRequestor,
lastClientSelection,
lastClientTarget,
success == SELECTION_SUCCESS ? lastClientProperty : None);
/* /*
* Enable further requests from clients. * 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