unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Jameson Graef Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument
Date: Wed, 16 May 2012 14:55:56 -0700	[thread overview]
Message-ID: <1337205359-2444-4-git-send-email-jrollins@finestructure.net> (raw)
In-Reply-To: <1337205359-2444-3-git-send-email-jrollins@finestructure.net>

Again, for interface simplification and getting rid of more #ifdefs.
---
 mime-node.c      |   10 ++--------
 notmuch-client.h |   14 +++++---------
 notmuch-reply.c  |    6 ++----
 notmuch-show.c   |    3 +--
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/mime-node.c b/mime-node.c
index 79a3654..4faeffc 100644
--- a/mime-node.c
+++ b/mime-node.c
@@ -56,12 +56,7 @@ _mime_node_context_free (mime_node_context_t *res)
 
 notmuch_status_t
 mime_node_open (const void *ctx, notmuch_message_t *message,
-#ifdef GMIME_ATLEAST_26
-		GMimeCryptoContext *cryptoctx,
-#else
-		GMimeCipherContext *cryptoctx,
-#endif
-		notmuch_bool_t decrypt, mime_node_t **root_out)
+		notmuch_crypto_t *crypto, mime_node_t **root_out)
 {
     const char *filename = notmuch_message_get_filename (message);
     mime_node_context_t *mctx;
@@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
 	goto DONE;
     }
 
-    mctx->crypto.gpgctx = cryptoctx;
-    mctx->crypto.decrypt = decrypt;
+    mctx->crypto = *crypto;
 
     /* Create the root node */
     root->part = GMIME_OBJECT (mctx->mime_message);
diff --git a/notmuch-client.h b/notmuch-client.h
index 2ad24cf..d86fab3 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -345,9 +345,10 @@ struct mime_node {
 };
 
 /* Construct a new MIME node pointing to the root message part of
- * message.  If cryptoctx is non-NULL, it will be used to verify
- * signatures on any child parts.  If decrypt is true, then cryptoctx
- * will additionally be used to decrypt any encrypted child parts.
+ * message.  If crypto.gpgctx is non-NULL, it will be used to verify
+ * signatures on any child parts.  If crypto.decrypt is true, then
+ * crypto.gpgctx will additionally be used to decrypt any encrypted
+ * child parts.
  *
  * Return value:
  *
@@ -359,12 +360,7 @@ struct mime_node {
  */
 notmuch_status_t
 mime_node_open (const void *ctx, notmuch_message_t *message,
-#ifdef GMIME_ATLEAST_26
-		GMimeCryptoContext *cryptoctx,
-#else
-		GMimeCipherContext *cryptoctx,
-#endif
-		notmuch_bool_t decrypt, mime_node_t **node_out);
+		notmuch_crypto_t *crypto, mime_node_t **node_out);
 
 /* Return a new MIME node for the requested child part of parent.
  * parent will be used as the talloc context for the returned child
diff --git a/notmuch-reply.c b/notmuch-reply.c
index ed87899..6662adb 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx,
 	g_object_unref (G_OBJECT (reply));
 	reply = NULL;
 
-	if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,
-			    &root) == NOTMUCH_STATUS_SUCCESS) {
+	if (mime_node_open (ctx, message, crypto, &root) == NOTMUCH_STATUS_SUCCESS) {
 	    format_part_reply (root);
 	    talloc_free (root);
 	}
@@ -574,8 +573,7 @@ notmuch_reply_format_json(void *ctx,
 
     messages = notmuch_query_search_messages (query);
     message = notmuch_messages_get (messages);
-    if (mime_node_open (ctx, message, crypto->gpgctx, crypto->decrypt,
-			&node) != NOTMUCH_STATUS_SUCCESS)
+    if (mime_node_open (ctx, message, crypto, &node) != NOTMUCH_STATUS_SUCCESS)
 	return 1;
 
     reply = create_reply_message (ctx, config, message, reply_all);
diff --git a/notmuch-show.c b/notmuch-show.c
index d254179..8b4d308 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -810,8 +810,7 @@ show_message (void *ctx,
     mime_node_t *root, *part;
     notmuch_status_t status;
 
-    status = mime_node_open (local, message, params->crypto.gpgctx,
-			     params->crypto.decrypt, &root);
+    status = mime_node_open (local, message, &(params->crypto), &root);
     if (status)
 	goto DONE;
     part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
-- 
1.7.10

  reply	other threads:[~2012-05-16 21:56 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-16 21:55 [PATCH 0/6] cli: improve handling of crypto parameters contexts Jameson Graef Rollins
2012-05-16 21:55 ` [PATCH 1/6] cli: new crypto structure to store crypto contexts and parameters Jameson Graef Rollins
2012-05-16 21:55   ` [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t Jameson Graef Rollins
2012-05-16 21:55     ` Jameson Graef Rollins [this message]
2012-05-16 21:55       ` [PATCH 4/6] cli: intialize crypto structure in show and reply Jameson Graef Rollins
2012-05-16 21:55         ` [PATCH 5/6] cli: new crypto verify flag to handle verification Jameson Graef Rollins
2012-05-16 21:55           ` [PATCH 6/6] cli: lazily create the crypto gpg context only when needed Jameson Graef Rollins
2012-05-17 22:29             ` Austin Clements
2012-05-17  7:47         ` [PATCH 4/6] cli: intialize crypto structure in show and reply Jani Nikula
2012-05-17 14:26           ` Jameson Graef Rollins
2012-05-17 16:31             ` Jani Nikula
2012-05-17 16:45               ` Jameson Graef Rollins
2012-05-17 20:23                 ` Jani Nikula
2012-05-17 20:53                   ` Jameson Graef Rollins
2012-05-17 21:51                 ` Daniel Kahn Gillmor
2012-05-18  6:59                   ` Tomi Ollila
2012-05-18  8:20                   ` Jani Nikula
2012-05-18 17:09                     ` Daniel Kahn Gillmor
2012-05-17 22:29         ` Austin Clements
2012-05-17  7:40       ` [PATCH 3/6] cli: modify mime_node_open to take crypto struct as argument Jani Nikula
2012-05-17 22:26       ` Austin Clements
2012-05-17  7:37     ` [PATCH 2/6] cli: modify mime_node_context to use the new notmuch_crypto_t Jani Nikula
2012-05-17  7:36   ` [PATCH 1/6] cli: new crypto structure to store crypto contexts and parameters Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337205359-2444-4-git-send-email-jrollins@finestructure.net \
    --to=jrollins@finestructure.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).