[gtk: 2/2] Merge branch 'fix-shell-colorpicker' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit d13cd9cb67f5ab19c4daf49d6749a663bc382d81
Merge: 79b87cc543 08f32c6560
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Aug 17 12:35:46 2018 +0000

    Merge branch 'fix-shell-colorpicker' into 'master'
    
    colorpickershell: Unpack the tuple returned from PickColor()
    
    See merge request GNOME/gtk!296

 gtk/gtkcolorpickershell.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---