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