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