Merge branch 'mjog/592-workaround-glib-deadlock' into 'mainline'

Workaround type initialisation deadlock in GObject

See merge request GNOME/geary!407
This commit is contained in:
Michael Gratton 2020-03-06 06:36:13 +00:00
commit c3cfd52e77

View file

@ -41,6 +41,10 @@ public class Geary.Engine : BaseObject {
private static bool is_initialized = false;
static construct {
// Work around GNOME/glib#541
typeof(Imap.MailboxAttributes).name();
}
// This can't be called from within the ctor, as initialization
// code may want to access the Engine instance to make their own