Re: [PATCH 2/2] cli: mime node: abstract decryption and signature verification

diff --git a/c5/2c8864103b0729b39ca87df51888c547e10e64 b/c5/2c8864103b0729b39ca87df51888c547e10e64
new file mode 100644 (file)
index 0000000..e1b3047
--- /dev/null
+++ b/c5/2c8864103b0729b39ca87df51888c547e10e64
@@ -0,0 +1,74 @@
+Return-Path: <bremner@unb.ca>\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 44541431FBF\r
+       for <notmuch@notmuchmail.org>; Fri, 29 Mar 2013 18:48:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 W6WrAntZro7P for <notmuch@notmuchmail.org>;\r
+       Fri, 29 Mar 2013 18:48:49 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2E5BB431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 29 Mar 2013 18:48:49 -0700 (PDT)\r
+Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1ULkuT-00060l-Kp; Fri, 29 Mar 2013 22:48:45 -0300\r
+Received: (nullmailer pid 11278 invoked by uid 1000);\r
+       Fri, 29 Mar 2013 23:05:54 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] cli: mime node: abstract decryption and signature\r
+       verification\r
+In-Reply-To:\r
+ <d250faaac8aae1f6383b7a77e84e4b4144791688.1362319765.git.jani@nikula.org>\r
+References:\r
+ <a9f12ba474fc51df71e2fd2b7a20a8d101729c6e.1362319765.git.jani@nikula.org>\r
+       <d250faaac8aae1f6383b7a77e84e4b4144791688.1362319765.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.15.1 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 29 Mar 2013 19:05:54 -0400\r
+Message-ID: <87k3opiz71.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sat, 30 Mar 2013 01:48:53 -0000\r
+\r
+Jani Nikula <jani@nikula.org> writes:\r
+\r
+> The code filled with #ifdef GMIME_ATLEAST_26 is difficult to\r
+> read. Abstract the decryption and signature verification into\r
+> functions, with separate implementations for GMime 2.4 and 2.6, to\r
+> clarify the code.\r
+\r
+This series mostly looks OK, although it's a challenge to track all the\r
+code movement.\r
+\r
+I'd like some way to make it more obvious to the reader which version of\r
+the functions they are reading (when the #ifdef GMIME_ATLEAST_26 has\r
+scrolled off screen). The simplest would just be a comment in front of\r
+each function.\r
+\r
+d\r
+\r
+\r
+\r