[gtk/gtk-3-24: 3/3] Merge branch 'display-woes' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit e4509d723e13cc371d5b0e959e06e19de381616e
Merge: ed9825e8ca b1d55f2c85
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 24 16:35:13 2020 +0000

    Merge branch 'display-woes' into 'gtk-3-24'
    
    Couple of fixes for GtkDisplay open/close
    
    See merge request GNOME/gtk!1343

 gdk/wayland/gdkwindow-wayland.c |  5 ++---
 gtk/gtkicontheme.c              |  7 ++++---
 gtk/gtkmodules.c                |  8 ++++----
 gtk/gtksettings.c               | 31 ++++++++++++++++++++++++++++++-
 4 files changed, 40 insertions(+), 11 deletions(-)
---