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

[Matthias Clasen <matthiasc src gnome org>]

commit 173e919d2af01ee6ba173b3c2ce07148abf372e6
Merge: 55b9aa0309 8e0ba37866
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 31 18:13:36 2020 +0000

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

 demos/gtk-demo/awardlistitem.ui   |  11 +++-
 demos/gtk-demo/iconscroll.c       |  51 ++++++++++++++++-
 demos/gtk-demo/listview_colors.c  |  44 +++++++++++----
 demos/gtk-demo/listview_weather.c |  36 +++++++-----
 demos/gtk-demo/sliding_puzzle.c   |   2 +
 gtk/gtkprintbackend.c             | 116 +++++++++++++++-----------------------
 gtk/gtkprintbackendprivate.h      |   2 +
 gtk/gtkprinter.c                  |   4 +-
 8 files changed, 164 insertions(+), 102 deletions(-)
---