[glib: 2/2] Merge branch 'trash-portal' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 1f7d5b85d71ba250ad3fe5623a3055f81f43efde
Merge: 5d719c782 bca4ff7c5
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Feb 4 13:38:03 2019 +0000

    Merge branch 'trash-portal' into 'master'
    
    Support the trash portal
    
    See merge request GNOME/glib!276

 docs/reference/gio/meson.build       |   1 +
 gio/glocalfile.c                     |   5 ++
 gio/gtrashportal.c                   | 123 +++++++++++++++++++++++++++++++++++
 gio/gtrashportal.h                   |  31 +++++++++
 gio/meson.build                      |   6 +-
 gio/org.freedesktop.portal.Trash.xml |  48 ++++++++++++++
 6 files changed, 213 insertions(+), 1 deletion(-)
---