[gtk: 3/3] Merge branch 'wip/on-the-surface-good-fences-can-make-bad-neighbors' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit e25c25fcb5878905ec761e1cad31ee7754c80432
Merge: 72d3a9042c 56b3669411
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 30 19:21:45 2020 +0000

    Merge branch 'wip/on-the-surface-good-fences-can-make-bad-neighbors' into 'master'
    
    x11: Handle window getting unmap while frame still pending
    
    Closes #2902
    
    See merge request GNOME/gtk!2168

 gdk/x11/gdkdisplay-x11.c   |  2 +-
 gdk/x11/gdkglcontext-x11.c | 59 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 50 insertions(+), 11 deletions(-)
---