[glib: 2/2] Merge branch 'drop-old-xdgmime-change' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 1161bd8078deb429d111dcdc3e09981cefbd9a89
Merge: e045675d8 3dcae415a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Nov 2 09:28:22 2021 +0000

    Merge branch 'drop-old-xdgmime-change' into 'main'
    
    Revert "Don't compile some unused functions in gio/xdgmime/"
    
    See merge request GNOME/glib!2277

 gio/xdgmime/xdgmime.c       | 22 +---------------------
 gio/xdgmime/xdgmime.h       | 14 ++------------
 gio/xdgmime/xdgmimealias.c  |  4 +---
 gio/xdgmime/xdgmimealias.h  |  3 +--
 gio/xdgmime/xdgmimecache.c  |  8 +-------
 gio/xdgmime/xdgmimecache.h  |  6 ------
 gio/xdgmime/xdgmimeglob.c   |  7 -------
 gio/xdgmime/xdgmimeglob.h   |  2 --
 gio/xdgmime/xdgmimeicon.c   |  2 --
 gio/xdgmime/xdgmimeicon.h   |  2 --
 gio/xdgmime/xdgmimeparent.c |  2 --
 gio/xdgmime/xdgmimeparent.h |  2 --
 12 files changed, 6 insertions(+), 68 deletions(-)
---