--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2CE60431FBD\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id ncvPiQqky7pU for <notmuch@notmuchmail.org>;\r
+ Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id EC595431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:12 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f8a6d000000914-fd-4f6bef33b9b2\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id B0.F8.02324.33FEB6F4; Thu, 22 Mar 2012 23:34:11 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q2N3YBL0025960; \r
+ Thu, 22 Mar 2012 23:34:11 -0400\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2N3Y8ZE007969\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 22 Mar 2012 23:34:10 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1SAvGS-0002PH-Ml; Thu, 22 Mar 2012 23:34:08 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] reply: Convert default reply format to self-recursive\r
+ style\r
+Date: Thu, 22 Mar 2012 23:34:06 -0400\r
+Message-Id: <1332473647-9133-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+References: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrmv8PtvfYGW/vsX1mzOZHRg9nq26\r
+ xRzAGMVlk5Kak1mWWqRvl8CVsf8YS8FWo4qrV++xNTBu0Oxi5OSQEDCR2HvtECuELSZx4d56\r
+ ti5GLg4hgX2MEi83zGaCcDYwSnzed4MdwrnPJDH1xgWosvmMEku/tLOB9LMJaEhs27+cEcQW\r
+ EZCW2Hl3NtBcDg5mATWJP10qIGFhgQCJ5v53bCBhFgFVieebDUHCvAL2EtOv7GKBuEJB4tzq\r
+ c+wgNqeAg8TZz/fAJgoB1Wx98oV9AiP/AkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbomermZ\r
+ JXqpKaWbGEEhwynJv4Px20GlQ4wCHIxKPLzNPtn+QqyJZcWVuYcYJTmYlER5Gd4BhfiS8lMq\r
+ MxKLM+KLSnNSiw8xSnAwK4nwKjkD5XhTEiurUovyYVLSHCxK4rxqWu/8hATSE0tSs1NTC1KL\r
+ YLIyHBxKEryTQIYKFqWmp1akZeaUIKSZODhBhvMADV8KUsNbXJCYW5yZDpE/xagoJc67BCQh\r
+ AJLIKM2D64XF9CtGcaBXhHkXg1TxANMBXPcroMFMQIMnXMsCGVySiJCSamDUnx60LkPyYpXD\r
+ jueJNf1Gl8QK53mu3qUw+/t+n7cy0Rf4a+vXf393ROqT+PPp++fJfJJrO3O+ps4twvhdQqBV\r
+ 4IL++IJtBy0a7Kxss2bLdh+fYN6QWO/jdu1dc2HLxXJ9ya9vrdfKTZ72NbBX+0hSz6usUiWO\r
+ P049My2ab/C0zOiJkp9SyKrEUpyRaKjFXFScCABKPIbYxAIAAA==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 23 Mar 2012 03:34:14 -0000\r
+\r
+This re-arranges the default reply formatter code to use the\r
+mime_node_t abstraction. There are no semantic changes.\r
+---\r
+ notmuch-reply.c | 119 +++++++++++++++++++++----------------------------------\r
+ 1 files changed, 45 insertions(+), 74 deletions(-)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 2f5ed3d..84a1220 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -24,28 +24,6 @@\r
+ #include "gmime-filter-headers.h"\r
+ \r
+ static void\r
+-reply_headers_message_part (GMimeMessage *message);\r
+-\r
+-static void\r
+-reply_part_content (GMimeObject *part);\r
+-\r
+-static const notmuch_show_format_t format_reply = {\r
+- "", NULL,\r
+- "", NULL,\r
+- "", NULL, reply_headers_message_part, ">\n",\r
+- "",\r
+- NULL,\r
+- NULL,\r
+- NULL,\r
+- reply_part_content,\r
+- NULL,\r
+- "",\r
+- "",\r
+- "", "",\r
+- ""\r
+-};\r
+-\r
+-static void\r
+ show_reply_headers (GMimeMessage *message)\r
+ {\r
+ GMimeStream *stream_stdout = NULL, *stream_filter = NULL;\r
+@@ -65,66 +43,55 @@ show_reply_headers (GMimeMessage *message)\r
+ }\r
+ \r
+ static void\r
+-reply_headers_message_part (GMimeMessage *message)\r
++format_part_reply (mime_node_t *node)\r
+ {\r
+- InternetAddressList *recipients;\r
+- const char *recipients_string;\r
++ int i;\r
+ \r
+- printf ("> From: %s\n", g_mime_message_get_sender (message));\r
+- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+- recipients_string = internet_address_list_to_string (recipients, 0);\r
+- if (recipients_string)\r
+- printf ("> To: %s\n",\r
+- recipients_string);\r
+- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
+- recipients_string = internet_address_list_to_string (recipients, 0);\r
+- if (recipients_string)\r
+- printf ("> Cc: %s\n",\r
+- recipients_string);\r
+- printf ("> Subject: %s\n", g_mime_message_get_subject (message));\r
+- printf ("> Date: %s\n", g_mime_message_get_date_as_string (message));\r
+-}\r
++ if (GMIME_IS_MESSAGE (node->part)) {\r
++ GMimeMessage *message = GMIME_MESSAGE (node->part);\r
++ InternetAddressList *recipients;\r
++ const char *recipients_string;\r
+ \r
++ printf ("> From: %s\n", g_mime_message_get_sender (message));\r
++ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
++ recipients_string = internet_address_list_to_string (recipients, 0);\r
++ if (recipients_string)\r
++ printf ("> To: %s\n",\r
++ recipients_string);\r
++ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
++ recipients_string = internet_address_list_to_string (recipients, 0);\r
++ if (recipients_string)\r
++ printf ("> Cc: %s\n",\r
++ recipients_string);\r
++ printf ("> Subject: %s\n", g_mime_message_get_subject (message));\r
++ printf ("> Date: %s\n", g_mime_message_get_date_as_string (message));\r
++ printf (">\n");\r
++ } else if (GMIME_IS_PART (node->part)) {\r
++ GMimeContentType *content_type = g_mime_object_get_content_type (node->part);\r
++ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part);\r
+ \r
+-static void\r
+-reply_part_content (GMimeObject *part)\r
+-{\r
+- GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));\r
+- GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);\r
+-\r
+- if (g_mime_content_type_is_type (content_type, "multipart", "*") ||\r
+- g_mime_content_type_is_type (content_type, "message", "rfc822"))\r
+- {\r
+- /* Output nothing, since multipart subparts will be handled individually. */\r
+- }\r
+- else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||\r
+- g_mime_content_type_is_type (content_type, "application", "pgp-signature"))\r
+- {\r
+- /* Ignore PGP/MIME cruft parts */\r
+- }\r
+- else if (g_mime_content_type_is_type (content_type, "text", "*") &&\r
+- !g_mime_content_type_is_type (content_type, "text", "html"))\r
+- {\r
+- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);\r
+- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+- show_text_part_content (part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY);\r
+- g_object_unref(stream_stdout);\r
+- }\r
+- else\r
+- {\r
+- if (disposition &&\r
+- strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)\r
+- {\r
+- const char *filename = g_mime_part_get_filename (GMIME_PART (part));\r
++ if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||\r
++ g_mime_content_type_is_type (content_type, "application", "pgp-signature")) {\r
++ /* Ignore PGP/MIME cruft parts */\r
++ } else if (g_mime_content_type_is_type (content_type, "text", "*") &&\r
++ !g_mime_content_type_is_type (content_type, "text", "html")) {\r
++ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);\r
++ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
++ show_text_part_content (node->part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY);\r
++ g_object_unref(stream_stdout);\r
++ } else if (disposition &&\r
++ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) {\r
++ const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));\r
+ printf ("Attachment: %s (%s)\n", filename,\r
+ g_mime_content_type_to_string (content_type));\r
+- }\r
+- else\r
+- {\r
++ } else {\r
+ printf ("Non-text part: %s\n",\r
+ g_mime_content_type_to_string (content_type));\r
+ }\r
+ }\r
++\r
++ for (i = 0; i < node->nchildren; i++)\r
++ format_part_reply (mime_node_child (node, i));\r
+ }\r
+ \r
+ /* Is the given address configured as one of the user's "personal" or\r
+@@ -550,7 +517,7 @@ notmuch_reply_format_default(void *ctx,\r
+ GMimeMessage *reply;\r
+ notmuch_messages_t *messages;\r
+ notmuch_message_t *message;\r
+- const notmuch_show_format_t *format = &format_reply;\r
++ mime_node_t *root;\r
+ \r
+ for (messages = notmuch_query_search_messages (query);\r
+ notmuch_messages_valid (messages);\r
+@@ -577,7 +544,11 @@ notmuch_reply_format_default(void *ctx,\r
+ notmuch_message_get_header (message, "date"),\r
+ notmuch_message_get_header (message, "from"));\r
+ \r
+- show_message_body (message, format, params);\r
++ if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt,\r
++ &root) == NOTMUCH_STATUS_SUCCESS) {\r
++ format_part_reply (mime_node_child (root, 0));\r
++ talloc_free (root);\r
++ }\r
+ \r
+ notmuch_message_destroy (message);\r
+ }\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff