brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Don't invariably queue a pending delete request

Browse Source 
We don't need doing this roundtrip for non-INCR transfers.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1198

(cherry picked from commit d2c762cc66718f1b79bb476b68439d00a16fd2a2)
This commit is contained in:
Carlos Garnacho 2020-04-11 17:13:52 +02:00 committed by Robert Mader
parent bb831f04c5
commit 7cc5ed96fc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11/meta-x11-selection-output-stream.c
View File

@ -247,9 +247,13 @@ meta_x11_selection_output_stream_perform_flush (MetaX11SelectionOutputStream *st
PropModeReplace, PropModeReplace,
(guchar *) &(long) { n_elements }, (guchar *) &(long) { n_elements },
1); 1);
priv->delete_pending = TRUE;
} }
else else
{ {
if (priv->incr && priv->data->len > 0)
priv->delete_pending = TRUE;
XChangeProperty (xdisplay, XChangeProperty (xdisplay,
priv->xwindow, priv->xwindow,
priv->xproperty, priv->xproperty,
@ -264,7 +268,6 @@ meta_x11_selection_output_stream_perform_flush (MetaX11SelectionOutputStream *st
if (first_chunk) if (first_chunk)
meta_x11_selection_output_stream_notify_selection (stream); meta_x11_selection_output_stream_notify_selection (stream);
priv->delete_pending = TRUE;
g_cond_broadcast (&priv->cond); g_cond_broadcast (&priv->cond);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);