--- /dev/null
+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 CE0A1431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:15 -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 tju43eBMD4OD for <notmuch@notmuchmail.org>;\r
+ Thu, 17 May 2012 00:40:15 -0700 (PDT)\r
+Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com\r
+ [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id BD930431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:14 -0700 (PDT)\r
+Received: by lagu2 with SMTP id u2so1267840lag.26\r
+ for <notmuch@notmuchmail.org>; Thu, 17 May 2012 00:40:13 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type:x-gm-message-state;\r
+ bh=CDm68BDzzhfko6/HI/HInJ2q3+90we5sC+F4IyccBAI=;\r
+ b=Jf9kMhTFMThaY9+OSTjgBsGqe64jV+i5rXNfke/N9Tawex7FmRqoyoi7c6QlPRTGwR\r
+ tLJJJF5OSnFw/g8ydms80k1MlVWxNRUdRwFJgKd336aMfJDxoSi8CrW0m010LOsC1Xpl\r
+ HiWz777U0fmYrC3fC97vms0eNfxSdF1TTrZj163jXUOjS+keKQN4JxgGhNxav++/jYPK\r
+ xW8KkB3gPDOElZrvguxGjVUgd9gQZ6JvDmjh8n7XZQCNGc4aDeJdULjkaoKhU2IuBLCE\r
+ pLBqfXZ5+B5C4tVoYvRzZXPTFVFPcH/QuRM2g68j25VjBliL2LOtGkVE8D/MVA4wQ0u0\r
+ SJpA==\r
+Received: by 10.152.132.166 with SMTP id ov6mr6383606lab.35.1337240413100;\r
+ Thu, 17 May 2012 00:40:13 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
+ [80.220.80.68])\r
+ by mx.google.com with ESMTPS id oi3sm6696204lab.12.2012.05.17.00.40.11\r
+ (version=SSLv3 cipher=OTHER); Thu, 17 May 2012 00:40:12 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as\r
+ argument\r
+In-Reply-To: <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
+References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net>\r
+ <1337205359-2444-2-git-send-email-jrollins@finestructure.net>\r
+ <1337205359-2444-3-git-send-email-jrollins@finestructure.net>\r
+ <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
+User-Agent: Notmuch/0.13+13~gc259b9a (http://notmuchmail.org) Emacs/23.3.1\r
+ (i686-pc-linux-gnu)\r
+Date: Thu, 17 May 2012 10:40:09 +0300\r
+Message-ID: <878vgri7c6.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQnkaoP7y4X1hI4DftRPfu1xuC1OYioyqLZWdk/FlWcSg2r1UtqG63UDsYZtyfSmOY+hmxFr\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: Thu, 17 May 2012 07:40:15 -0000\r
+\r
+On Thu, 17 May 2012, Jameson Graef Rollins <jrollins@finestructure.net> wrote:\r
+> Again, for interface simplification and getting rid of more #ifdefs.\r
+> ---\r
+> mime-node.c | 10 ++--------\r
+> notmuch-client.h | 14 +++++---------\r
+> notmuch-reply.c | 6 ++----\r
+> notmuch-show.c | 3 +--\r
+> 4 files changed, 10 insertions(+), 23 deletions(-)\r
+>\r
+> diff --git a/mime-node.c b/mime-node.c\r
+> index 79a3654..4faeffc 100644\r
+> --- a/mime-node.c\r
+> +++ b/mime-node.c\r
+> @@ -56,12 +56,7 @@ _mime_node_context_free (mime_node_context_t *res)\r
+> \r
+> notmuch_status_t\r
+> mime_node_open (const void *ctx, notmuch_message_t *message,\r
+> -#ifdef GMIME_ATLEAST_26\r
+> - GMimeCryptoContext *cryptoctx,\r
+> -#else\r
+> - GMimeCipherContext *cryptoctx,\r
+> -#endif\r
+> - notmuch_bool_t decrypt, mime_node_t **root_out)\r
+> + notmuch_crypto_t *crypto, mime_node_t **root_out)\r
+> {\r
+> const char *filename = notmuch_message_get_filename (message);\r
+> mime_node_context_t *mctx;\r
+> @@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,\r
+> goto DONE;\r
+> }\r
+> \r
+> - mctx->crypto.gpgctx = cryptoctx;\r
+> - mctx->crypto.decrypt = decrypt;\r
+> + mctx->crypto = *crypto;\r
+> \r
+> /* Create the root node */\r
+> root->part = GMIME_OBJECT (mctx->mime_message);\r
+> diff --git a/notmuch-client.h b/notmuch-client.h\r
+> index 2ad24cf..d86fab3 100644\r
+> --- a/notmuch-client.h\r
+> +++ b/notmuch-client.h\r
+> @@ -345,9 +345,10 @@ struct mime_node {\r
+> };\r
+> \r
+> /* Construct a new MIME node pointing to the root message part of\r
+> - * message. If cryptoctx is non-NULL, it will be used to verify\r
+> - * signatures on any child parts. If decrypt is true, then cryptoctx\r
+> - * will additionally be used to decrypt any encrypted child parts.\r
+> + * message. If crypto.gpgctx is non-NULL, it will be used to verify\r
+> + * signatures on any child parts. If crypto.decrypt is true, then\r
+> + * crypto.gpgctx will additionally be used to decrypt any encrypted\r
+> + * child parts.\r
+> *\r
+> * Return value:\r
+> *\r
+> @@ -359,12 +360,7 @@ struct mime_node {\r
+> */\r
+> notmuch_status_t\r
+> mime_node_open (const void *ctx, notmuch_message_t *message,\r
+> -#ifdef GMIME_ATLEAST_26\r
+> - GMimeCryptoContext *cryptoctx,\r
+> -#else\r
+> - GMimeCipherContext *cryptoctx,\r
+> -#endif\r
+> - notmuch_bool_t decrypt, mime_node_t **node_out);\r
+> + notmuch_crypto_t *crypto, mime_node_t **node_out);\r
+> \r
+> /* Return a new MIME node for the requested child part of parent.\r
+> * parent will be used as the talloc context for the returned child\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index ed87899..6662adb 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx,\r
+> g_object_unref (G_OBJECT (reply));\r
+> reply = NULL;\r
+> \r
+> - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,\r
+> - &root) == NOTMUCH_STATUS_SUCCESS) {\r
+> + if (mime_node_open (ctx, message, crypto, &root) == NOTMUCH_STATUS_SUCCESS) {\r
+> format_part_reply (root);\r
+> talloc_free (root);\r
+> }\r
+> @@ -574,8 +573,7 @@ notmuch_reply_format_json(void *ctx,\r
+> \r
+> messages = notmuch_query_search_messages (query);\r
+> message = notmuch_messages_get (messages);\r
+> - if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,\r
+> - &node) != NOTMUCH_STATUS_SUCCESS)\r
+> + if (mime_node_open (ctx, message, crypto, &node) != NOTMUCH_STATUS_SUCCESS)\r
+> return 1;\r
+> \r
+> reply = create_reply_message (ctx, config, message, reply_all);\r
+> diff --git a/notmuch-show.c b/notmuch-show.c\r
+> index d254179..8b4d308 100644\r
+> --- a/notmuch-show.c\r
+> +++ b/notmuch-show.c\r
+> @@ -810,8 +810,7 @@ show_message (void *ctx,\r
+> mime_node_t *root, *part;\r
+> notmuch_status_t status;\r
+> \r
+> - status = mime_node_open (local, message, params->crypto.gpgctx,\r
+> - params->crypto.decrypt, &root);\r
+> + status = mime_node_open (local, message, &(params->crypto), &root);\r
+\r
+The parenthesis around params->crypto are not needed, otherwise LGTM.\r
+\r
+> if (status)\r
+> goto DONE;\r
+> part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));\r
+> -- \r
+> 1.7.10\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff