[gtk/gtk-3-22: 2/2] Merge branch 'gtksocket-scale-3-22' into 'gtk-3-22'

[Emmanuele Bassi <ebassi src gnome org>]

commit 9ac7f906aae7f9f252988a5a7f294123b622c8c1
Merge: e0206cafcd c8b0a0dea5
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed May 30 10:18:56 2018 +0000

    Merge branch 'gtksocket-scale-3-22' into 'gtk-3-22'
    
    gtksocket: Adjust X sizes by scale-factor
    
    See merge request GNOME/gtk!164

 gtk/gtksocket.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
---