X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage-file.c;h=18802974fe87ed7ae26b18925dff015d5b5b110e;hp=8f0dbbda872570e184e2e4f8dc1b8800f04fc4e5;hb=e9b870b6923afe767a7c9938be24f5390102031a;hpb=040c3236afcf95bead0324a48c2e0b9cd7934993

diff --git a/lib/message-file.c b/lib/message-file.c
index 8f0dbbda..18802974 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -135,7 +135,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
     is_mbox = _is_mbox (message->file);
 
     if (! initialized) {
-	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
+	g_mime_init ();
 	initialized = 1;
     }
 
@@ -152,7 +152,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
     parser = g_mime_parser_new_with_stream (stream);
     g_mime_parser_set_scan_from (parser, is_mbox);
 
-    message->message = g_mime_parser_construct_message (parser);
+    message->message = g_mime_parser_construct_message (parser, NULL);
     if (! message->message) {
 	status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
 	goto DONE;
@@ -212,7 +212,7 @@ static char *
 _extend_header (char *combined, const char *value) {
     char *decoded;
 
-    decoded = g_mime_utils_header_decode_text (value);
+    decoded = g_mime_utils_header_decode_text (NULL, value);
     if (! decoded) {
 	if (combined) {
 	    g_free (combined);
@@ -238,47 +238,6 @@ _extend_header (char *combined, const char *value) {
     return combined;
 }
 
-#if (GMIME_MAJOR_VERSION < 3)
-static char *
-_notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
-					   const char *header)
-{
-    GMimeHeaderList *headers;
-    GMimeHeaderIter *iter;
-    char *combined = NULL;
-
-    headers = g_mime_object_get_header_list (GMIME_OBJECT (message->message));
-    if (! headers)
-	return NULL;
-
-    iter = g_mime_header_iter_new ();
-    if (! iter)
-	return NULL;
-
-    if (! g_mime_header_list_get_iter (headers, iter))
-	goto DONE;
-
-    do {
-	const char *value;
-	if (strcasecmp (g_mime_header_iter_get_name (iter), header) != 0)
-	    continue;
-
-	/* Note that GMime retains ownership of value... */
-	value = g_mime_header_iter_get_value (iter);
-
-	combined = _extend_header (combined, value);
-    } while (g_mime_header_iter_next (iter));
-
-    /* Return empty string for non-existing headers. */
-    if (! combined)
-	combined = g_strdup ("");
-
-  DONE:
-    g_mime_header_iter_free (iter);
-
-    return combined;
-}
-#else
 static char *
 _notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
 					   const char *header)
@@ -310,7 +269,6 @@ _notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
 
     return combined;
 }
-#endif
 
 const char *
 _notmuch_message_file_get_header (notmuch_message_file_t *message,
@@ -338,7 +296,7 @@ _notmuch_message_file_get_header (notmuch_message_file_t *message,
 	value = g_mime_object_get_header (GMIME_OBJECT (message->message),
 					  header);
 	if (value)
-	    decoded = g_mime_utils_header_decode_text (value);
+	    decoded = g_mime_utils_header_decode_text (NULL, value);
 	else
 	    decoded = g_strdup ("");
     }