--- /dev/null
+Return-Path: <jrollins@finestructure.net>\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 238A1431FC0\r
+ for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] 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 9NGOGiYe6tE0 for <notmuch@notmuchmail.org>;\r
+ Wed, 16 May 2012 14:56:08 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+ [131.215.239.19])\r
+ by olra.theworths.org (Postfix) with ESMTP id 6833E431FAF\r
+ for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:08 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+ by earth-doxen-postvirus (Postfix) with ESMTP id 0C76366E0179\r
+ for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:06 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com\r
+ [184.74.199.219]) (Authenticated sender: jrollins)\r
+ by earth-doxen-submit (Postfix) with ESMTP id B823166E01A1\r
+ for <notmuch@notmuchmail.org>; Wed, 16 May 2012 14:56:03 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+ id 1AA705DA; Wed, 16 May 2012 14:56:02 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as\r
+ argument\r
+Date: Wed, 16 May 2012 14:55:56 -0700\r
+Message-Id: <1337205359-2444-4-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337205359-2444-3-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
+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: Wed, 16 May 2012 21:56:11 -0000\r
+\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
+ 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
projects / notmuch-archives.git / commitdiff