diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:58:09 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:58:09 +0200 |
| commit | 5405447e5a0ec582a474a0e506265475bd4fd5a8 (patch) | |
| tree | 96a4ed65f1a16eadf46816d6b55d96fd976be421 /nx-X11/programs/Xserver/hw/nxagent/Events.c | |
| parent | 3a3a3373c36b5af6208ee5fdfe25e64b5766b75a (diff) | |
| parent | 72c022406f83d78425daae3037aebd2123f66293 (diff) | |
| download | nx-libs-5405447e5a0ec582a474a0e506265475bd4fd5a8.tar.gz nx-libs-5405447e5a0ec582a474a0e506265475bd4fd5a8.tar.bz2 nx-libs-5405447e5a0ec582a474a0e506265475bd4fd5a8.zip | |
Merge branch 'uli42-pr/clipboard_overhaul' into 3.6.x
Attributes GH PR #846: https://github.com/ArcticaProject/nx-libs/pull/846
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index e9de1450d..cbdf17a22 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -944,7 +944,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) fprintf(stderr, "nxagentDispatchEvents: Going to handle new SelectionNotify event.\n"); #endif - nxagentNotifySelection(&X); + nxagentHandleSelectionNotifyFromXServer(&X); break; } @@ -2933,12 +2933,7 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X) if (SelectionCallback) { - int i = 0; - - while ((i < NumCurrentSelections) && - CurrentSelections[i].selection != local) - i++; - + int i = nxagentFindCurrentSelectionIndex(local); if (i < NumCurrentSelections) { SelectionInfoRec info; |