[glib/glib-2-66: 3/3] Merge branch 'backport-1868-desktop-parsing-glib-2-66' into 'glib-2-66'

[Emmanuele Bassi <ebassi src gnome org>]

commit 872181c4f86720f2ca58a6c0671b10ae9caae2b1
Merge: 13732f800 4963b48a8
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Jan 11 12:30:32 2021 +0000

    Merge branch 'backport-1868-desktop-parsing-glib-2-66' into 'glib-2-66'
    
    Backport !1868 “gdesktopappinfo: Fix validation of XDG_CURRENT_DESKTOP” to glib-2-66
    
    See merge request GNOME/glib!1872

 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(-)
---