[glib: 3/3] Merge branch 'fix-desktop-validation' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 4c0df3f04fd6a90716e065278411ffa4278e6d06
Merge: 6cf43f5c3 a2525129a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jan 11 12:00:06 2021 +0000

    Merge branch 'fix-desktop-validation' into 'master'
    
    gdesktopappinfo: Fix validation of XDG_CURRENT_DESKTOP
    
    See merge request GNOME/glib!1868

 gio/gdesktopappinfo.c                              | 78 ++++++++++------------
 gio/tests/desktop-app-info.c                       |  6 +-
 .../usr/applications/invalid-desktop.desktop       |  5 ++
 gio/tests/file.c                                   |  4 +-
 4 files changed, 47 insertions(+), 46 deletions(-)
---