[glib: 2/2] Merge branch 'cancellable-cancel-null' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 35db2ffe9c061e6daf6389f6592b66feb3f93cfe
Merge: aeb7dbad3 e13c64646
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Mar 5 16:06:29 2019 +0000

    Merge branch 'cancellable-cancel-null' into 'master'
    
    gcancellable: add back lost NULL check in g_cancellable_cancel()
    
    Closes #1710
    
    See merge request GNOME/glib!707

 gio/gcancellable.c      | 2 +-
 gio/tests/cancellable.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
---