[glib: 11/11] Merge branch 'xdgmime_update' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 60173d0a387b45016684be8846c291dabd0aa5e8
Merge: 1bfac1e47 2f98cbe48
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Sep 27 11:50:48 2021 +0000

    Merge branch 'xdgmime_update' into 'main'
    
    Updating xdgmime
    
    See merge request GNOME/glib!2029

 gio/xdgmime/meson.build     |   3 +-
 gio/xdgmime/xdgmime.c       |  28 +++++----
 gio/xdgmime/xdgmime.h       |   4 +-
 gio/xdgmime/xdgmimealias.c  |   8 ++-
 gio/xdgmime/xdgmimealias.h  |   4 +-
 gio/xdgmime/xdgmimecache.c  | 139 ++++++++++++++++++++++----------------------
 gio/xdgmime/xdgmimecache.h  |   4 +-
 gio/xdgmime/xdgmimeglob.c   |  10 +++-
 gio/xdgmime/xdgmimeglob.h   |   4 +-
 gio/xdgmime/xdgmimeicon.c   |   9 ++-
 gio/xdgmime/xdgmimeicon.h   |   4 +-
 gio/xdgmime/xdgmimeint.c    |  10 +++-
 gio/xdgmime/xdgmimeint.h    |   4 +-
 gio/xdgmime/xdgmimemagic.c  |  22 +++----
 gio/xdgmime/xdgmimemagic.h  |   4 +-
 gio/xdgmime/xdgmimeparent.c |   9 ++-
 gio/xdgmime/xdgmimeparent.h |   4 +-
 17 files changed, 159 insertions(+), 111 deletions(-)
---