[gtk/gtk-4-6: 3/3] Merge branch 'backports-for-4-6' into 'gtk-4-6'

[Matthias Clasen <matthiasc src gnome org>]

commit 41086f075659a20c7e535984557d901cc555b035
Merge: 1523fecfe1 78c153ae14
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 28 15:59:03 2022 +0000

    Merge branch 'backports-for-4-6' into 'gtk-4-6'
    
    Avoid g_log_set_writer_func in tests
    
    See merge request GNOME/gtk!4773

 gdk/broadway/broadway-protocol.h |   1 +
 gdk/broadway/broadwayd.c         |  32 ++---
 testsuite/gtk/icontheme.c        | 270 ++++++++++++++++++++-------------------
 testsuite/gtk/treestore.c        |  30 ++---
 4 files changed, 167 insertions(+), 166 deletions(-)
---