[glib/glib-2-70: 6/6] Merge branch 'backport-2161-delayed-settings-null-handling-glib-2-70' into 'glib-2-70'

[Sebastian Dröge <sdroege src gnome org>]

commit a28c93003bf47c3283e592341ec9e38d3362d07c
Merge: eaf3169a4 e665cc94c
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu Nov 4 10:52:37 2021 +0000

    Merge branch 'backport-2161-delayed-settings-null-handling-glib-2-70' into 'glib-2-70'
    
    Backport !2161 “gdelayedsettingsbackend: Fix applying after calling g_settings_reset()” to glib-2-70
    
    See merge request GNOME/glib!2320

 gio/gdelayedsettingsbackend.c |   3 +-
 gio/gsettings.c               |  30 +++----
 gio/tests/gsettings.c         | 191 +++++++++++++++++++-----------------------
 3 files changed, 103 insertions(+), 121 deletions(-)
---