[glib: 13/13] Merge branch 'guri-gio' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit df8dc7fc3841d40d70e1e509928c11928ecfa6cf
Merge: 71d1a28af 0fea3d71e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Aug 5 16:06:02 2020 +0000

    Merge branch 'guri-gio' into 'master'
    
    Replace _g_uri_parse_authority() with GUri
    
    Closes #2156
    
    See merge request GNOME/glib!1567

 gio/gnetworkaddress.c         | 322 +++---------------------------------------
 gio/gnetworkingprivate.h      |  10 --
 gio/gnetworkservice.c         |  12 +-
 gio/gproxyaddressenumerator.c |  37 +----
 gio/gproxyresolver.c          |  13 +-
 gio/gsimpleproxyresolver.c    |   7 +-
 gio/gsocketaddress.c          |   2 +-
 glib/guri.c                   |  92 ++++++------
 glib/guri.h                   |   8 +-
 glib/tests/uri.c              |   7 +-
 10 files changed, 108 insertions(+), 402 deletions(-)
---