diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-10-10 01:49:03 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-12 22:11:33 -0300 |
| commit | 3e9857a0b98c04973b9b6ad2da7dc5c3992b3b1c (patch) | |
| tree | 2cd50149271c2702821cc7059e92c5b1b7cd15a3 /notmuch-client.h | |
| parent | 88f2a72ef1dcfce149bbac776652ea04e564726d (diff) | |
crypto: drop pretense of notmuch_crypto_context_t
notmuch_crypto_context_t was introduced (i think) as some sort of
abstraction layer to make notmuch somewhat independent of GMime. But
it isn't even useful for GMime 3.0 or later -- we can drop the
pretense that it's some sort of abstraction in this case, and just
call it what it is, GMimeCryptoContext, which is useful for building
against older versions of GMime.
This also renames _notmuch_crypto_get_context() to
_notmuch_crypto_get_gmime_context().
Diffstat (limited to 'notmuch-client.h')
| -rw-r--r-- | notmuch-client.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index 224912c5..62acc70e 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -32,7 +32,6 @@ #include "gmime-extra.h" -typedef GMimeCryptoContext notmuch_crypto_context_t; /* This is automatically included only since gmime 2.6.10 */ #include <gmime/gmime-pkcs7-context.h> @@ -76,8 +75,8 @@ typedef struct _notmuch_crypto { bool verify; bool decrypt; #if (GMIME_MAJOR_VERSION < 3) - notmuch_crypto_context_t* gpgctx; - notmuch_crypto_context_t* pkcs7ctx; + GMimeCryptoContext* gpgctx; + GMimeCryptoContext* pkcs7ctx; const char *gpgpath; #endif } _notmuch_crypto_t; @@ -182,8 +181,8 @@ void notmuch_exit_if_unsupported_format (void); #if (GMIME_MAJOR_VERSION <3) -notmuch_crypto_context_t * -_notmuch_crypto_get_context (_notmuch_crypto_t *crypto, const char *protocol); +GMimeCryptoContext * +_notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protocol); #endif int |