[glib: 6/6] Merge branch 'wip/oholy/trashing-locations2' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit e22bffb522124ce6443ffef5a784510197ea9540
Merge: e3280675f 1cbb5dd95
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jun 9 00:28:09 2018 +0000

    Merge branch 'wip/oholy/trashing-locations2' into 'master'
    
    Resubmit of reverted trash related changes and tests
    
    See merge request GNOME/glib!83

 gio/glocalfile.c      |  56 +++++++++++++++++++++++----
 gio/glocalfileinfo.c  |   8 +++-
 gio/tests/Makefile.am |   1 +
 gio/tests/meson.build |   1 +
 gio/tests/trash.c     | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 160 insertions(+), 9 deletions(-)
---