[gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 08ecf779f9506e74f863edc9552977f2a5e4f71c
Merge: 668868fb1f 5d7907caa5
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 8 02:19:42 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2674

 gdk/broadway/gdksurface-broadway.c |  7 +++-
 gdk/gdkdisplay.c                   | 80 ++------------------------------------
 gdk/gdkdisplayprivate.h            | 12 ------
 gdk/gdkevents.c                    |  4 --
 gdk/gdksurface.c                   | 23 -----------
 gdk/gdksurfaceprivate.h            |  3 --
 gdk/wayland/gdksurface-wayland.c   |  6 ++-
 gdk/win32/gdkdevicemanager-win32.c |  7 +++-
 gdk/win32/gdkdrag-win32.c          |  5 ++-
 gdk/x11/gdkdisplay-x11.c           |  9 +++--
 gdk/x11/gdkdrag-x11.c              | 10 ++++-
 gdk/x11/gdksurface-x11.c           |  8 +++-
 12 files changed, 41 insertions(+), 133 deletions(-)
---