X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Findex.cc;h=e5ae2ba73d568027f1c661994e073aff8852a942;hb=6499fce3911df2646db67c0f1ff65672324904f0;hp=0beaae62f048c37001e699351df030705e2341d9;hpb=55c047ee0b0c9081ead76925ee1adaeb858264dd;p=notmuch

diff --git a/lib/index.cc b/lib/index.cc
index 0beaae62..e5ae2ba7 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -184,7 +184,7 @@ filter_filter (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t pres
 
     int next;
 
-    g_mime_filter_set_size (gmime_filter, inlen, FALSE);
+    g_mime_filter_set_size (gmime_filter, inlen, false);
     outptr = gmime_filter->outbuf;
 
     next = filter->state;
@@ -409,7 +409,14 @@ _index_mime_part (notmuch_message_t *message,
 		}
 	    }
 	    if (GMIME_IS_MULTIPART_ENCRYPTED (multipart)) {
-		/* Don't index encrypted parts. */
+		/* Don't index encrypted parts, but index their content type. */
+		_index_content_type (message,
+				     g_mime_multipart_get_part (multipart, i));
+		if ((i != GMIME_MULTIPART_ENCRYPTED_VERSION) &&
+		    (i != GMIME_MULTIPART_ENCRYPTED_CONTENT)) {
+		    _notmuch_database_log (_notmuch_message_database (message),
+					   "Warning: Unexpected extra parts of multipart/encrypted.\n");
+		}
 		continue;
 	    }
 	    _index_mime_part (message,
@@ -453,7 +460,7 @@ _index_mime_part (notmuch_message_t *message,
     byte_array = g_byte_array_new ();
 
     stream = g_mime_stream_mem_new_with_byte_array (byte_array);
-    g_mime_stream_mem_set_owner (GMIME_STREAM_MEM (stream), FALSE);
+    g_mime_stream_mem_set_owner (GMIME_STREAM_MEM (stream), false);
 
     filter = g_mime_stream_filter_new (stream);
 
@@ -486,7 +493,7 @@ _index_mime_part (notmuch_message_t *message,
     g_object_unref (discard_non_term_filter);
 
     g_byte_array_append (byte_array, (guint8 *) "\0", 1);
-    body = (char *) g_byte_array_free (byte_array, FALSE);
+    body = (char *) g_byte_array_free (byte_array, false);
 
     if (body) {
 	_notmuch_message_gen_terms (message, NULL, body);