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

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;
     }