diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-11-19 20:51:17 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-11-19 20:51:17 (GMT) |
| commit | 9a4eabf02474d2d013be9be01b9cd78227bace3e (patch) | |
| tree | 241bd0447728e6708315bb634188915886321d89 /unix/tkUnixSelect.c | |
| parent | 3bf68add2afec0323e278d4747d618a48fb1a855 (diff) | |
| parent | 1be013d5076a48c72c60f3c611335cc787004b4e (diff) | |
| download | tk-9a4eabf02474d2d013be9be01b9cd78227bace3e.zip tk-9a4eabf02474d2d013be9be01b9cd78227bace3e.tar.gz tk-9a4eabf02474d2d013be9be01b9cd78227bace3e.tar.bz2 | |
Fix [73ba07efcd]: Use correct property type when handling MULTIPLE conversion requests. Patch from 'dpb'
Diffstat (limited to 'unix/tkUnixSelect.c')
| -rw-r--r-- | unix/tkUnixSelect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c index 896e897..e67970d 100644 --- a/unix/tkUnixSelect.c +++ b/unix/tkUnixSelect.c @@ -872,8 +872,9 @@ ConvertSelection( goto refuse; } result = XGetWindowProperty(eventPtr->display, eventPtr->requestor, - eventPtr->property, 0, MAX_PROP_WORDS, False, XA_ATOM, - &type, &format, &incr.numConversions, &bytesAfter, + eventPtr->property, 0, MAX_PROP_WORDS, False, + winPtr->dispPtr->atomPairAtom, &type, &format, + &incr.numConversions, &bytesAfter, (unsigned char **) multAtomsPtr); if ((result != Success) || (bytesAfter != 0) || (format != 32) || (type == None)) { @@ -1035,8 +1036,8 @@ ConvertSelection( } if (multiple) { XChangeProperty(reply.xsel.display, reply.xsel.requestor, - reply.xsel.property, XA_ATOM, 32, PropModeReplace, - (unsigned char *) incr.multAtoms, + reply.xsel.property, winPtr->dispPtr->atomPairAtom, + 32, PropModeReplace, (unsigned char *) incr.multAtoms, (int) incr.numConversions*2); } else { /* |