[PATCH v2 0/3] cli: clean up gmime 2.4 vs. 2.6 conditional build

diff --git a/d4/4ba440563f2dd4817c041bf377ed2dc0ee73f5 b/d4/4ba440563f2dd4817c041bf377ed2dc0ee73f5
new file mode 100644 (file)
index 0000000..814ae7a
--- /dev/null
+++ b/d4/4ba440563f2dd4817c041bf377ed2dc0ee73f5
@@ -0,0 +1,90 @@
+Return-Path: <jani@nikula.org>\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 DF75F431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:23 -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 Jsk21nBH-5wp for <notmuch@notmuchmail.org>;\r
+       Sat, 30 Mar 2013 06:53:21 -0700 (PDT)\r
+Received: from mail-la0-f51.google.com (mail-la0-f51.google.com\r
+       [209.85.215.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 72F82431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:21 -0700 (PDT)\r
+Received: by mail-la0-f51.google.com with SMTP id fo13so1127361lab.10\r
+       for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:20 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer\r
+       :x-gm-message-state;\r
+       bh=B28G1Zmth8qxrwvS6kVNISl9xOHkWtkG3JFbMacbKwI=;\r
+       b=GL0l0mKx4edh7ZljsVemtNorMavWt+CjewHaNpFfwIpoHOrzwzL0eks2QZjydgb8x/\r
+       isQlgNkrV4Y1tK/oxkUKE6eTiVaHcRkYYQ7ana17Y7tNlvWcctVdTsA/kkhE1Z8p0DDK\r
+       WIIGl6WchsabH/5EJsrr09hz4Rq5DAK6Lk9AR4clVG7bNPFasVC/cGMMYdJNE8YdIA0D\r
+       3PexIK0/iJoAFAvQogG8TKiNIYR+a2NFNGMYs6QygvVpTA6k2ofPbm/ALst6S99r+dhM\r
+       nBI2W31L/HXQCsNbG/Uocxt8YTAzKaxpxVB+hPb0NzumJnJ1R9UE8FB3YOq2KpmQQ+Jh\r
+       es7w==\r
+X-Received: by 10.112.41.136 with SMTP id f8mr2806874lbl.121.1364651599906;\r
+       Sat, 30 Mar 2013 06:53:19 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id jh4sm2585815lab.7.2013.03.30.06.53.18\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 30 Mar 2013 06:53:19 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 0/3] cli: clean up gmime 2.4 vs. 2.6 conditional build\r
+Date: Sat, 30 Mar 2013 15:53:14 +0200\r
+Message-Id: <cover.1364651359.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQle3UT6gLa8brwmR87Zh53GLZ8IJ6LD0D8isi/hRTh0sQFN7qficDzCqVx4qVQybLuZfjZJ\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 13:53:24 -0000\r
+\r
+This is v2 of [1]. Added comments per David's request, and while at it,\r
+added a third patch to conform the existing conditional build in notmuch\r
+show to the same style. The whole series should have no functional\r
+changes, and thus v2 should have no functional changes since v1. ;)\r
+\r
+I have not tested this on gmime 2.4.\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+[1] id:a9f12ba474fc51df71e2fd2b7a20a8d101729c6e.1362319765.git.jani@nikula.org\r
+\r
+Jani Nikula (3):\r
+  cli: crypto: abstract gpg context creation for clarity\r
+  cli: mime node: abstract decryption and signature verification\r
+  cli: conform to same conditional build style as elsewhere in\r
+    notmuch-show\r
+\r
+ crypto.c       |   66 ++++++++++++-----\r
+ mime-node.c    |  218 ++++++++++++++++++++++++++++++++++++--------------------\r
+ notmuch-show.c |   46 ++++++------\r
+ 3 files changed, 215 insertions(+), 115 deletions(-)\r
+\r
+-- \r
+1.7.10.4\r
+\r