[dconf: 2/2] Merge branch 'patch/ow' into 'master'

[Ray Strode <halfline src gnome org>]

commit 9f16f682457ab7e493367c25deddcdd3bb8b3612
Merge: e01be93 d148fff
Author: Ray Strode <halfline gmail com>
Date:   Fri Jul 13 14:47:45 2018 +0000

    Merge branch 'patch/ow' into 'master'
    
    Engine: track in progress watch handles to avoid spurious changed signals for the root path
    
    See merge request GNOME/dconf!1

 engine/dconf-engine.c | 88 ++++++++++++++++++++++++++++++++++++++++++++-------
 engine/dconf-engine.h | 11 +++++++
 tests/engine.c        | 66 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 151 insertions(+), 14 deletions(-)
---