[gnome-software: 2/2] Merge branch '1196-race-condition-under-gs_plugin_icons_load_cached' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 1f799e378dd83836cabb13958ee107a7f3bb2c54
Merge: 5c115458b f05f68c65
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Mar 26 12:30:39 2021 +0000

    Merge branch '1196-race-condition-under-gs_plugin_icons_load_cached' into 'master'
    
    Resolve "Race condition under gs_plugin_icons_load_cached()"
    
    Closes #1196
    
    See merge request GNOME/gnome-software!668

 lib/gs-app.c                   | 52 ++++++++++++++++++++++++++++++++++++++++++
 lib/gs-app.h                   |  5 ++++
 plugins/core/gs-plugin-icons.c | 24 +------------------
 3 files changed, 58 insertions(+), 23 deletions(-)
---