X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Findex.cc;h=418224880a2ff9a9b9dc565e9182a8a9538097c1;hp=6b6fbb8f577ece5ebd4bd1d1f7d88a32ece51e7d;hb=582f255aeba3998428fa489dc22c735bd0b88143;hpb=bb0b119358e4d6df5cc085a48cb3d2e09e396922

diff --git a/lib/index.cc b/lib/index.cc
index 6b6fbb8f..41822488 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -357,7 +357,7 @@ _index_content_type (notmuch_message_t *message, GMimeObject *part)
 {
     GMimeContentType *content_type = g_mime_object_get_content_type (part);
     if (content_type) {
-	char *mime_string = g_mime_content_type_to_string (content_type);
+	char *mime_string = g_mime_content_type_get_mime_type (content_type);
 	if (mime_string) {
 	    _notmuch_message_gen_terms (message, "mimetype", mime_string);
 	    g_free (mime_string);
@@ -493,7 +493,7 @@ _index_mime_part (notmuch_message_t *message,
 	}
     }
 
-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+    wrapper = g_mime_part_get_content (GMIME_PART (part));
     if (wrapper)
 	g_mime_data_wrapper_write_to_stream (wrapper, filter);
 
@@ -528,12 +528,11 @@ _index_encrypted_mime_part (notmuch_message_t *message,
 
     notmuch = notmuch_message_get_database (message);
 
-    GMimeCryptoContext* crypto_ctx = NULL;
     bool attempted = false;
     GMimeDecryptResult *decrypt_result = NULL;
     bool get_sk = (notmuch_indexopts_get_decrypt_policy (indexopts) == NOTMUCH_DECRYPT_TRUE);
     clear = _notmuch_crypto_decrypt (&attempted, notmuch_indexopts_get_decrypt_policy (indexopts),
-				     message, crypto_ctx, encrypted_data, get_sk ? &decrypt_result : NULL, &err);
+				     message, encrypted_data, get_sk ? &decrypt_result : NULL, &err);
     if (!attempted)
 	return;
     if (err || !clear) {
@@ -591,7 +590,6 @@ _notmuch_message_index_file (notmuch_message_t *message,
     addresses = g_mime_message_get_from (mime_message);
     if (addresses) {
 	_index_address_list (message, "from", addresses);
-	g_mime_2_6_unref (addresses);
     }
 
     addresses = g_mime_message_get_all_recipients (mime_message);