lib: index the content-type of the parts of encrypted messages

[notmuch] / lib / index.cc

diff --git a/lib/index.cc b/lib/index.cc
index 64bc92a5b56d1091fc62db4062f2ebce076e5924..ceb444df60bfdd7ad8bb36487599321a70dd6a9e 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -398,15 +398,25 @@ _index_mime_part (notmuch_message_t *message,
 
        for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
            if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
-               /* Don't index the signature. */
-               if (i == 1)
+               /* Don't index the signature, but index its content type. */
+               if (i == GMIME_MULTIPART_SIGNED_SIGNATURE) {
+                   _index_content_type (message,
+                                        g_mime_multipart_get_part (multipart, i));
                    continue;
-               if (i > 1)
+               } else if (i != GMIME_MULTIPART_SIGNED_CONTENT) {
                    _notmuch_database_log (_notmuch_message_database (message),
-                                         "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
+                                          "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
+               }
            }
            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,