index: explicitly follow GObject conventions

[notmuch] / lib / index.cc

diff --git a/lib/index.cc b/lib/index.cc
index 6e684f5fcda76dcc5fe81895e25194d7c1186e45..efd9da4ca015681d624be82354a06d1f5f0c7855 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -142,7 +142,8 @@ static void filter_reset (GMimeFilter *filter);
 static GMimeFilterClass *parent_class = NULL;
 
 static void
-notmuch_filter_discard_non_term_class_init (NotmuchFilterDiscardNonTermClass *klass)
+notmuch_filter_discard_non_term_class_init (NotmuchFilterDiscardNonTermClass *klass,
+                                           unused (void *class_data))
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     GMimeFilterClass *filter_class = GMIME_FILTER_CLASS (klass);
@@ -176,7 +177,7 @@ filter_filter (GMimeFilter *gmime_filter, char *inbuf, size_t inlen, size_t pres
 {
     NotmuchFilterDiscardNonTerm *filter = (NotmuchFilterDiscardNonTerm *) gmime_filter;
     const scanner_state_t *states = filter->states;
-    register const char *inptr = inbuf;
+    const char *inptr = inbuf;
     const char *inend = inbuf + inlen;
     char *outptr;
 
@@ -246,16 +247,16 @@ notmuch_filter_discard_non_term_new (GMimeContentType *content_type)
 
     if (!type) {
        static const GTypeInfo info = {
-           sizeof (NotmuchFilterDiscardNonTermClass),
-           NULL, /* base_class_init */
-           NULL, /* base_class_finalize */
-           (GClassInitFunc) notmuch_filter_discard_non_term_class_init,
-           NULL, /* class_finalize */
-           NULL, /* class_data */
-           sizeof (NotmuchFilterDiscardNonTerm),
-           0,    /* n_preallocs */
-           NULL, /* instance_init */
-           NULL  /* value_table */
+           .class_size = sizeof (NotmuchFilterDiscardNonTermClass),
+           .base_init = NULL,
+           .base_finalize = NULL,
+           .class_init = (GClassInitFunc) notmuch_filter_discard_non_term_class_init,
+           .class_finalize = NULL,
+           .class_data = NULL,
+           .instance_size = sizeof (NotmuchFilterDiscardNonTerm),
+           .n_preallocs = 0,
+           .instance_init = NULL,
+           .value_table = NULL,
        };
 
        type = g_type_register_static (GMIME_TYPE_FILTER, "NotmuchFilterDiscardNonTerm", &info, (GTypeFlags) 0);
@@ -385,7 +386,7 @@ _index_mime_part (notmuch_message_t *message,
     const char *charset;
 
     if (! part) {
-       _notmuch_database_log (_notmuch_message_database (message),
+       _notmuch_database_log (notmuch_message_get_database (message),
                              "Warning: Not indexing empty mime part.\n");
        return;
     }
@@ -411,7 +412,7 @@ _index_mime_part (notmuch_message_t *message,
                                         g_mime_multipart_get_part (multipart, i));
                    continue;
                } else if (i != GMIME_MULTIPART_SIGNED_CONTENT) {
-                   _notmuch_database_log (_notmuch_message_database (message),
+                   _notmuch_database_log (notmuch_message_get_database (message),
                                           "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
                }
            }
@@ -424,7 +425,7 @@ _index_mime_part (notmuch_message_t *message,
                                               GMIME_MULTIPART_ENCRYPTED (part));
                } else {
                    if (i != GMIME_MULTIPART_ENCRYPTED_VERSION) {
-                       _notmuch_database_log (_notmuch_message_database (message),
+                       _notmuch_database_log (notmuch_message_get_database (message),
                                               "Warning: Unexpected extra parts of multipart/encrypted.\n");
                    }
                }
@@ -447,7 +448,7 @@ _index_mime_part (notmuch_message_t *message,
     }
 
     if (! (GMIME_IS_PART (part))) {
-       _notmuch_database_log (_notmuch_message_database (message),
+       _notmuch_database_log (notmuch_message_get_database (message),
                              "Warning: Not indexing unknown mime part: %s.\n",
                              g_type_name (G_OBJECT_TYPE (part)));
        return;
@@ -525,14 +526,14 @@ _index_encrypted_mime_part (notmuch_message_t *message,
     notmuch_database_t * notmuch = NULL;
     GMimeObject *clear = NULL;
 
-    if (!indexopts || !notmuch_indexopts_get_try_decrypt (indexopts))
+    if (!indexopts || (notmuch_indexopts_get_decrypt_policy (indexopts) == NOTMUCH_DECRYPT_FALSE))
        return;
 
-    notmuch = _notmuch_message_database (message);
+    notmuch = notmuch_message_get_database (message);
 
+    GMimeCryptoContext* crypto_ctx = NULL;
 #if (GMIME_MAJOR_VERSION < 3)
     {
-       GMimeCryptoContext* crypto_ctx = NULL;
        const char *protocol = NULL;
        protocol = g_mime_content_type_get_parameter (content_type, "protocol");
        status = _notmuch_crypto_get_gmime_ctx_for_protocol (&(indexopts->crypto),
@@ -546,17 +547,25 @@ _index_encrypted_mime_part (notmuch_message_t *message,
                                              "property (%d)\n", status);
            return;
        }
-       clear = g_mime_multipart_encrypted_decrypt(encrypted_data, crypto_ctx,
-                                                  NULL, &err);
     }
-#else
-    clear = g_mime_multipart_encrypted_decrypt(encrypted_data, GMIME_DECRYPT_NONE, NULL,
-                                              NULL, &err);
 #endif
-    if (err) {
-       _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n",
-                              err->domain, err->code, err->message);
-       g_error_free(err);
+    bool attempted = false;
+    GMimeDecryptResult *decrypt_result = NULL;
+    bool get_sk = (HAVE_GMIME_SESSION_KEYS && 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);
+    if (!attempted)
+       return;
+    if (err || !clear) {
+       if (decrypt_result)
+           g_object_unref (decrypt_result);
+       if (err) {
+           _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n",
+                                  err->domain, err->code, err->message);
+           g_error_free(err);
+       } else {
+           _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (unknown error)\n");
+       }
        /* Indicate that we failed to decrypt during indexing */
        status = notmuch_message_add_property (message, "index.decryption", "failure");
        if (status)
@@ -564,6 +573,18 @@ _index_encrypted_mime_part (notmuch_message_t *message,
                                          "property (%d)\n", status);
        return;
     }
+    if (decrypt_result) {
+#if HAVE_GMIME_SESSION_KEYS
+       if (get_sk) {
+           status = notmuch_message_add_property (message, "session-key",
+                                                  g_mime_decrypt_result_get_session_key (decrypt_result));
+           if (status)
+               _notmuch_database_log (notmuch, "failed to add session-key "
+                                      "property (%d)\n", status);
+       }
+#endif
+       g_object_unref (decrypt_result);
+    }
     _index_mime_part (message, indexopts, clear);
     g_object_unref (clear);