[glib: 6/6] Merge branch 'wip/hadess/gnetworkmonitor-nm-fixups' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 84738f7e80093d7292a51a47d8446d129e839587
Merge: 86ba1b37b b80fcc6cb
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jul 29 15:47:55 2019 +0000

    Merge branch 'wip/hadess/gnetworkmonitor-nm-fixups' into 'master'
    
    gnetworkmonitornm fixups
    
    See merge request GNOME/glib!1016

 gio/gnetworkmonitor.c   |  2 +-
 gio/gnetworkmonitornm.c | 18 +++++++++++++-----
 gobject/tests/type.c    |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---