X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-reply.c;h=929f3077862f93e6f8c2b213f9d064369cc42fc9;hb=536d695a3151f78a0aed0a902298ac53826c46d6;hp=4c1dd56024698041f1c97bca50347ffca8cace2e;hpb=32819f74d3ac2eee25cf234d988688cc82ecbc0a;p=notmuch

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 4c1dd560..929f3077 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -286,7 +286,7 @@ static InternetAddressList *get_sender(GMimeMessage *message)
 	if (! reply_to_header_is_redundant (message, reply_to_list))
 	    return reply_to_list;
 
-	g_object_unref (G_OBJECT (reply_to_list));
+	g_mime_2_6_unref (G_OBJECT (reply_to_list));
     }
 
     return g_mime_message_get_from (message);
@@ -667,7 +667,7 @@ static int do_reply(notmuch_config_t *config,
 
 	    /* Start the original */
 	    sp->map_key (sp, "original");
-	    format_part_sprinter (config, sp, node, TRUE, TRUE, FALSE);
+	    format_part_sprinter (config, sp, node, TRUE, FALSE);
 
 	    /* End */
 	    sp->end (sp);
@@ -740,7 +740,9 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[])
 	return EXIT_FAILURE;
     }
 
+#if (GMIME_MAJOR_VERSION < 3)
     params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
+#endif
 
     if (notmuch_database_open (notmuch_config_get_database_path (config),
 			       NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))