[glib: 6/6] Merge branch 'wip/oholy/fix-trash-symlink' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 1564ef55896b37c469dc8ee230068488bfaf0871
Merge: 25b7716e0 a56b9cc6b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Oct 24 00:03:55 2018 +0000

    Merge branch 'wip/oholy/fix-trash-symlink' into 'master'
    
    glocalfile: Fix access::can-trash if parent is symlink
    
    Closes #1522
    
    See merge request GNOME/glib!326

 gio/glocalfile.c  | 138 +++++++++++++++++++++++++++++++++++-------------------
 gio/tests/trash.c |  69 ++++++++++++++++++++++++++-
 2 files changed, 157 insertions(+), 50 deletions(-)
---