Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3641F429E28 for ; Wed, 8 Jun 2011 12:30:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.921 X-Spam-Level: X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id klM+m3Ryg5CG for ; Wed, 8 Jun 2011 12:30:16 -0700 (PDT) Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu [131.215.239.19]) by olra.theworths.org (Postfix) with ESMTP id BF35F431FB6 for ; Wed, 8 Jun 2011 12:30:16 -0700 (PDT) Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1]) by earth-doxen-postvirus (Postfix) with ESMTP id 2790C66E016E; Wed, 8 Jun 2011 12:30:15 -0700 (PDT) X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new Received: from servo.finestructure.net (gwave-108.ligo.caltech.edu [131.215.114.108]) (Authenticated sender: jrollins) by earth-doxen-submit (Postfix) with ESMTP id D1DDA66E048E; Wed, 8 Jun 2011 12:30:11 -0700 (PDT) Received: by servo.finestructure.net (Postfix, from userid 1000) id EBEE46F7; Wed, 8 Jun 2011 12:30:12 -0700 (PDT) From: Jameson Graef Rollins To: Notmuch Mail Subject: [PATCH 4/4] Ignore "application/pgp-*" parts in reply. Date: Wed, 8 Jun 2011 12:30:09 -0700 Message-Id: <1307561409-5646-5-git-send-email-jrollins@finestructure.net> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307561409-5646-4-git-send-email-jrollins@finestructure.net> References: <1307320169-29905-4-git-send-email-jrollins@finestructure.net> <1307561409-5646-1-git-send-email-jrollins@finestructure.net> <1307561409-5646-2-git-send-email-jrollins@finestructure.net> <1307561409-5646-3-git-send-email-jrollins@finestructure.net> <1307561409-5646-4-git-send-email-jrollins@finestructure.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2011 19:30:17 -0000 The quoted text doesn't need to mention that the message being replied to had these crufty parts. --- notmuch-reply.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/notmuch-reply.c b/notmuch-reply.c index 7a76ba3..0eb295e 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -98,6 +98,11 @@ reply_part_content (GMimeObject *part) { /* Output nothing, since multipart subparts will be handled individually. */ } + else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") || + g_mime_content_type_is_type (content_type, "application", "pgp-signature")) + { + /* Ignore PGP/MIME cruft parts */ + } else if (g_mime_content_type_is_type (content_type, "text", "*") && !g_mime_content_type_is_type (content_type, "text", "html")) { -- 1.7.5.3