[gtk: 4/4] Merge branch 'wip/hadess/portal-fixes' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 2a3dab5b94f07c3e42a371f7885e7480e891af85
Merge: 96f0c26306 8cf41c1b66
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 30 17:45:40 2020 +0000

    Merge branch 'wip/hadess/portal-fixes' into 'master'
    
    Portal fixes
    
    See merge request GNOME/gtk!1585

 gtk/gtkcolorpickerportal.c       | 12 ++++++---
 gtk/gtkfilechoosernativeportal.c | 12 +++++++--
 gtk/gtkprivate.c                 | 57 ++++++++++++++++++++++++++++++++++++++++
 gtk/gtkprivate.h                 |  2 ++
 4 files changed, 77 insertions(+), 6 deletions(-)
---