[glib: 6/6] Merge branch '2168-io-module-default' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 20c2a0539c0751de3129544f779c6e8130c4aeb6
Merge: 95729db0e 793f824a2
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jan 7 15:15:46 2021 +0000

    Merge branch '2168-io-module-default' into 'master'
    
    gio: Ignore various environment variables when running as setuid
    
    Closes #2168
    
    See merge request GNOME/glib!1862

 docs/reference/gio/overview.xml |  6 ++++++
 gio/gdbusaddress.c              |  8 ++++++--
 gio/gdesktopappinfo.c           | 45 +++++++++++++++++++++++++++++++++++++++--
 gio/giomodule.c                 | 24 ++++++++++++++++++----
 gio/gresource.c                 |  9 +++++++--
 gio/gsettingsschema.c           |  6 +++++-
 6 files changed, 87 insertions(+), 11 deletions(-)
---