[glib: 4/4] Merge branch 'wip/oholy/trashing-locations' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 205059b9c0aa17887f4faa3d2957f71efc18997d
Merge: 5107d209d f7e80f8d0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Jun 6 10:58:22 2018 +0000

    Merge branch 'wip/oholy/trashing-locations' into 'master'
    
    glocalfile: Allow trashing only for locations supported by trash:///
    
    See merge request GNOME/glib!49

 gio/glocalfile.c      |  28 +++++++++++++-
 gio/tests/Makefile.am |   1 +
 gio/tests/meson.build |   1 +
 gio/tests/trash.c     | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 133 insertions(+), 1 deletion(-)
---