[glib: 3/3] Merge branch '604-dbus-name-watching-simplification' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 5d32b99d0c620b75ccb861d1ab85e4c959364bbc
Merge: 5c7a88e97 73a33e501
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Jan 21 11:15:36 2020 +0000

    Merge branch '604-dbus-name-watching-simplification' into 'master'
    
    gdbusnamewatching: Check cancellation of a watch before calling back
    
    Closes #604
    
    See merge request GNOME/glib!1336

 gio/gdbusnamewatching.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
---