[gtk: 2/2] Merge branch 'patch-1' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 7a5567bf410434f62cff5c5262f9c2c0110c4556
Merge: f4c1a40446 a70f0356e9
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 3 18:10:03 2018 +0000

    Merge branch 'patch-1' into 'master'
    
    GtkWindow: Handle non-square icons with height > width correctly
    
    Closes #657
    
    See merge request GNOME/gtk!170

 gtk/gtkwindow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---