reply: Move reply citation printing to the recursive MIME walk

This makes more logical sense, since it makes the recursive printer
responsible for the entire reply body and lets it start at the root of
the MIME tree instead of the first child.  (We could move reply header
creation in there, too, but if we ever support proper reply to
multiple messages, we'll want just one set of reply headers computed
from the entire message set and many bodies.)
This commit is contained in:
Austin Clements 2012-03-27 17:59:52 -04:00 committed by David Bremner
parent 4d322fb579
commit 4ba18958b5

View file

@ -47,7 +47,11 @@ format_part_reply (mime_node_t *node)
{ {
int i; int i;
if (GMIME_IS_MESSAGE (node->part)) { if (node->envelope_file) {
printf ("On %s, %s wrote:\n",
notmuch_message_get_header (node->envelope_file, "date"),
notmuch_message_get_header (node->envelope_file, "from"));
} else if (GMIME_IS_MESSAGE (node->part)) {
GMimeMessage *message = GMIME_MESSAGE (node->part); GMimeMessage *message = GMIME_MESSAGE (node->part);
InternetAddressList *recipients; InternetAddressList *recipients;
const char *recipients_string; const char *recipients_string;
@ -540,13 +544,9 @@ notmuch_reply_format_default(void *ctx,
g_object_unref (G_OBJECT (reply)); g_object_unref (G_OBJECT (reply));
reply = NULL; reply = NULL;
printf ("On %s, %s wrote:\n",
notmuch_message_get_header (message, "date"),
notmuch_message_get_header (message, "from"));
if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt, if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt,
&root) == NOTMUCH_STATUS_SUCCESS) { &root) == NOTMUCH_STATUS_SUCCESS) {
format_part_reply (mime_node_child (root, 0)); format_part_reply (root);
talloc_free (root); talloc_free (root);
} }