b5/a39914013d0d1010137adfb764def496969225

   1 Return-Path: <jrollins@servo.finestructure.net>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 3641F429E28\r
   6         for <notmuch@notmuchmail.org>; Wed,  8 Jun 2011 12:30:17 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -1.921\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
  12         tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
  13         autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id klM+m3Ryg5CG for <notmuch@notmuchmail.org>;\r
  17         Wed,  8 Jun 2011 12:30:16 -0700 (PDT)\r
  18 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
  19         [131.215.239.19])\r
  20         by olra.theworths.org (Postfix) with ESMTP id BF35F431FB6\r
  21         for <notmuch@notmuchmail.org>; Wed,  8 Jun 2011 12:30:16 -0700 (PDT)\r
  22 Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
  23         by earth-doxen-postvirus (Postfix) with ESMTP id 2790C66E016E;\r
  24         Wed,  8 Jun 2011 12:30:15 -0700 (PDT)\r
  25 X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
  26 Received: from servo.finestructure.net (gwave-108.ligo.caltech.edu\r
  27         [131.215.114.108]) (Authenticated sender: jrollins)\r
  28         by earth-doxen-submit (Postfix) with ESMTP id D1DDA66E048E;\r
  29         Wed,  8 Jun 2011 12:30:11 -0700 (PDT)\r
  30 Received: by servo.finestructure.net (Postfix, from userid 1000)\r
  31         id EBEE46F7; Wed,  8 Jun 2011 12:30:12 -0700 (PDT)\r
  32 From: Jameson Graef Rollins <jrollins@finestructure.net>\r
  33 To: Notmuch Mail <notmuch@notmuchmail.org>\r
  34 Subject: [PATCH 4/4] Ignore "application/pgp-*" parts in reply.\r
  35 Date: Wed,  8 Jun 2011 12:30:09 -0700\r
  36 Message-Id: <1307561409-5646-5-git-send-email-jrollins@finestructure.net>\r
  37 X-Mailer: git-send-email 1.7.5.3\r
  38 In-Reply-To: <1307561409-5646-4-git-send-email-jrollins@finestructure.net>\r
  39 References: <1307320169-29905-4-git-send-email-jrollins@finestructure.net>\r
  40         <1307561409-5646-1-git-send-email-jrollins@finestructure.net>\r
  41         <1307561409-5646-2-git-send-email-jrollins@finestructure.net>\r
  42         <1307561409-5646-3-git-send-email-jrollins@finestructure.net>\r
  43         <1307561409-5646-4-git-send-email-jrollins@finestructure.net>\r
  44 X-BeenThere: notmuch@notmuchmail.org\r
  45 X-Mailman-Version: 2.1.13\r
  46 Precedence: list\r
  47 List-Id: "Use and development of the notmuch mail system."\r
  48         <notmuch.notmuchmail.org>\r
  49 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  50         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  51 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  52 List-Post: <mailto:notmuch@notmuchmail.org>\r
  53 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  54 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  56 X-List-Received-Date: Wed, 08 Jun 2011 19:30:17 -0000\r
  57 \r
  58 The quoted text doesn't need to mention that the message being replied\r
  59 to had these crufty parts.\r
  60 ---\r
  61  notmuch-reply.c |    5 +++++\r
  62  1 files changed, 5 insertions(+), 0 deletions(-)\r
  63 \r
  64 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  65 index 7a76ba3..0eb295e 100644\r
  66 --- a/notmuch-reply.c\r
  67 +++ b/notmuch-reply.c\r
  68 @@ -98,6 +98,11 @@ reply_part_content (GMimeObject *part)\r
  69      {\r
  70         /* Output nothing, since multipart subparts will be handled individually. */\r
  71      }\r
  72 +    else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||\r
  73 +            g_mime_content_type_is_type (content_type, "application", "pgp-signature"))\r
  74 +    {\r
  75 +       /* Ignore PGP/MIME cruft parts */\r
  76 +    }\r
  77      else if (g_mime_content_type_is_type (content_type, "text", "*") &&\r
  78         !g_mime_content_type_is_type (content_type, "text", "html"))\r
  79      {\r
  80 -- \r
  81 1.7.5.3\r
  82 \r