[glib/glib-2-58: 6/6] Merge branch '326-trash-symlinks-glib-2-58' into 'glib-2-58'

[Ondrej Holy <oholy src gnome org>]

commit 2daebb93fb1a2b510eaea3393b12d99556389849
Merge: fdf91511b aa5b7206e
Author: Ondrej Holy <oholy redhat com>
Date:   Wed Oct 31 07:23:04 2018 +0000

    Merge branch '326-trash-symlinks-glib-2-58' into 'glib-2-58'
    
    glocalfile: Fix access::can-trash if parent is symlink (backport to glib-2-58)
    
    See merge request GNOME/glib!431

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