index: explicitly follow GObject conventions

[notmuch] / lib / index.cc

diff --git a/lib/index.cc b/lib/index.cc
index 0ad683fac51b7704b1f15ee0c6c24b331dcfd02f..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;
@@ -528,7 +529,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
     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)