[glib/glib-2-58: 2/2] Merge branch 'glib-2-58-1513-icon-docs' into 'glib-2-58'

[Emmanuele Bassi <ebassi src gnome org>]

commit ae9bb1ea3ea8b49dab862e99e21c9aa4968d3313
Merge: ac1b680ec ad26f4c75
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Sep 17 13:11:31 2018 +0000

    Merge branch 'glib-2-58-1513-icon-docs' into 'glib-2-58'
    
    Backport to glib-2-58: Fix g_icon_to_string() regression (doc inconsistency)
    
    See merge request GNOME/glib!330

 gio/gicon.c        | 20 ++++++++++++++------
 gio/tests/g-icon.c | 12 +++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)
---