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

[Matthias Clasen <matthiasc src gnome org>]

commit d642bfc8ce53a9053d4d4406bb339170bb3c1a4e
Merge: d1d269ea6b c6a7b39ee1
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 8 19:13:44 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3037 and #3030
    
    See merge request GNOME/gtk!2417

 demos/gtk-demo/iconscroll.c      | 10 ++++++++--
 demos/gtk-demo/listview_colors.c |  2 +-
 demos/gtk-demo/main.c            | 15 +++++++++++----
 gtk/gtkbookmarksmanager.c        |  2 ++
 gtk/gtkcolorbutton.c             |  2 --
 gtk/gtkfilechooserbutton.c       |  6 +-----
 gtk/gtkfilechoosernative.c       |  2 --
 gtk/gtkfontbutton.c              |  2 --
 gtk/gtkpagesetupunixdialog.c     |  2 --
 gtk/gtkplacessidebar.c           | 25 +++++++++++++------------
 gtk/gtkprintoperation.c          |  2 --
 gtk/gtkprintunixdialog.c         |  2 --
 gtk/gtkshow.c                    |  2 --
 13 files changed, 36 insertions(+), 38 deletions(-)
---