[mutter/gnome-3-36] x11: Fix iterative INCR property checks



commit d9855175738b65ac2f5f220ec2e491e9f082223c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Apr 11 17:21:49 2020 +0200

    x11: Fix iterative INCR property checks
    
    It does not make sense to check for the stream not being closed,
    this might happen multiple times during the lifetime of the stream
    for a single transfer. We want to notify the INCR transfer just
    once.
    
    Check for the explicit conditions that we want, that the remaining
    data is bigger than we can transfer at once, and that we are not
    yet within the INCR transfer.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1198
    
    (cherry picked from commit a4596becc43959c3cd049fd49a236a9920fd9f24)

 src/x11/meta-x11-selection-output-stream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/x11/meta-x11-selection-output-stream.c b/src/x11/meta-x11-selection-output-stream.c
index 7179074e9..bc13dbcd9 100644
--- a/src/x11/meta-x11-selection-output-stream.c
+++ b/src/x11/meta-x11-selection-output-stream.c
@@ -223,7 +223,7 @@ meta_x11_selection_output_stream_perform_flush (MetaX11SelectionOutputStream *st
   if (!priv->incr)
     first_chunk = TRUE;
 
-  if (!g_output_stream_is_closing (G_OUTPUT_STREAM (stream)))
+  if (!priv->incr && priv->data->len > max_size)
     {
       XWindowAttributes attrs;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]