[glib: 4/4] Merge branch '1903-mimeapps-test-race' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit b0f43cc451c5772a48a50d37a1370878c749c4bf
Merge: f904587fc 592a13b48
Author: Sebastian Dröge <slomo coaxion net>
Date:   Fri Oct 18 15:32:04 2019 +0000

    Merge branch '1903-mimeapps-test-race' into 'master'
    
    Fix thread unsafety in GFileMonitorSource and mimeapps test
    
    Closes #1903
    
    See merge request GNOME/glib!1164

 gio/gdesktopappinfo.c   | 165 ++++++++++++++++++++++++++++--------------------
 gio/glocalfilemonitor.c |  63 ++++++++++--------
 gio/glocalfilemonitor.h |   1 +
 3 files changed, 133 insertions(+), 96 deletions(-)
---