diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
| commit | db7feaf9883bb0dc419593588036405ef12ebca1 (patch) | |
| tree | 1a911fe1a08aed78845e17b5350c9238452a12dd /nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | |
| parent | e77bf36d9afbc7e56522574b06217d57c11dd095 (diff) | |
| download | nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.gz nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.bz2 nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.zip | |
Revert "release 3.5.0.19"
This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index d4fa4a979..2742e147f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -166,9 +166,7 @@ Bool nxagentValidServerTargets(Atom target) if (target == XA_STRING) return True; if (target == serverTEXT) return True; - /* by dimbor */ - if (target == serverUTF8_STRING) return True; - + return False; } @@ -404,12 +402,7 @@ FIXME: Do we need this? lastServerProperty = X->xselectionrequest.property; lastServerRequestor = X->xselectionrequest.requestor; lastServerTarget = X->xselectionrequest.target; - - /* by dimbor */ - if (lastServerTarget != XA_STRING) - lastServerTarget = serverUTF8_STRING; - - lastServerTime = X->xselectionrequest.time; + lastServerTime = X->xselectionrequest.time; x.u.u.type = SelectionRequest; x.u.selectionRequest.time = GetTimeInMillis(); @@ -431,12 +424,11 @@ FIXME: Do we need this? x.u.selectionRequest.selection = CurrentSelections[i].selection; - /* by dimbor (idea from zahvatov) */ - if (X->xselectionrequest.target != XA_STRING) - x.u.selectionRequest.target = clientUTF8_STRING; - else - x.u.selectionRequest.target = XA_STRING; - + /* + * x.u.selectionRequest.target = X->xselectionrequest.target; + */ + + x.u.selectionRequest.target = XA_STRING; x.u.selectionRequest.property = clientCutProperty; (void) TryClientEvents(lastSelectionOwner[i].client, &x, 1, @@ -1226,11 +1218,10 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, Atom xa_STRING[4]; xEvent x; - /* --- Order changed by dimbor (prevent sending COMPOUND_TEXT to client --- */ xa_STRING[0] = XA_STRING; - xa_STRING[1] = clientUTF8_STRING; - xa_STRING[2] = clientTEXT; - xa_STRING[3] = clientCOMPOUND_TEXT; + xa_STRING[1] = clientTEXT; + xa_STRING[2] = clientCOMPOUND_TEXT; + xa_STRING[3] = clientUTF8_STRING; ChangeWindowProperty(pWin, property, |