[glib/glib-2-60: 4/4] Merge branch 'backport-984-985-keyfile-portal-fixes-glib-2-60' into 'glib-2-60'

[Matthias Clasen <matthiasc src gnome org>]

commit 0c149089ca1e8940c4d2bd404af560e10a0e96f3
Merge: cffe8efd0 715c8670a
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 15 14:15:37 2019 +0000

    Merge branch 'backport-984-985-keyfile-portal-fixes-glib-2-60' into 'glib-2-60'
    
    Backport !984, !985 keyfile/portal fixes to glib-2-60
    
    See merge request GNOME/glib!993

 gio/gkeyfilesettingsbackend.c |  5 +++--
 gio/gportalsupport.c          | 18 ++++++++++++++++++
 gio/gportalsupport.h          |  1 +
 3 files changed, 22 insertions(+), 2 deletions(-)
---