uncrustify.cfg: label indent, some known types, not, # and ##

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 0f682db413306ff5f6a7722299340f481c2d0fab..f55b1d22bbe2f1d5ed1603dafc3b7d2615715fa9 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -31,7 +31,7 @@ static void
 reply_part_content (GMimeObject *part);
 
 static const notmuch_show_format_t format_reply = {
-    "",
+    "", NULL,
        "", NULL,
            "", NULL, reply_headers_message_part, ">\n",
            "",
@@ -688,15 +688,22 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        reply_format_func = notmuch_reply_format_default;
 
     if (decrypt) {
+#ifdef GMIME_ATLEAST_26
+       /* TODO: GMimePasswordRequestFunc */
+       params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg");
+#else
        GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
        params.cryptoctx = g_mime_gpg_context_new (session, "gpg");
+#endif
        if (params.cryptoctx) {
            g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE);
            params.decrypt = TRUE;
        } else {
            fprintf (stderr, "Failed to construct gpg context.\n");
        }
+#ifndef GMIME_ATLEAST_26
        g_object_unref (session);
+#endif
     }
 
     config = notmuch_config_open (ctx, NULL, NULL);