[gtk: 2/2] Merge branch 'wip/otte/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit aad6b2d279fe31d3e69e285a687cd91e55ff8430
Merge: 76d31ff04b cf3830704b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 17 18:06:30 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    icontheme: Fix variable mixup leading to crashes
    
    Closes #4269
    
    See merge request GNOME/gtk!3967

 gtk/gtkicontheme.c                     | 28 ++++++++++++++--------------
 testsuite/reftests/meson.build         |  4 ++++
 testsuite/reftests/pixbuf-icon.ref.ui  | 13 +++++++++++++
 testsuite/reftests/pixbuf-icon.ui      | 16 ++++++++++++++++
 testsuite/reftests/texture-icon.ref.ui | 13 +++++++++++++
 testsuite/reftests/texture-icon.ui     | 16 ++++++++++++++++
 6 files changed, 76 insertions(+), 14 deletions(-)
---