X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=bb4f1801c133c1bff78dc761271ca31fc75954be;hb=0a84aaec6fd9b4e36ae27007779ded355fad2558;hp=52ed618b81a6e3815b45d89c9e486d871d508e91;hpb=cf8aaafbad6815ebdfcd9b3b36cfe3ca5ff2764b;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index 52ed618b..bb4f1801 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -649,11 +649,13 @@ notmuch_database_open (const char *path,
     }
 
     /* Initialize the GLib type system and threads */
+#if !GLIB_CHECK_VERSION(2, 35, 1)
     g_type_init ();
+#endif
 
     /* Initialize gmime */
     if (! initialized) {
-	g_mime_init (0);
+	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
 	initialized = 1;
     }