aboutsummaryrefslogtreecommitdiff
path: root/crypto.c
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2015-08-16 17:33:21 +0200
committerDavid Bremner <david@tethera.net>2015-08-26 20:01:45 -0300
commit005c2f0df17de8afdf9f67b923d26f2358236171 (patch)
tree92c803b40732cb353da299cbbd3cd46a9f71e0b4 /crypto.c
parentcb08a2ee019e52dc29ba393d139fce8d7282c632 (diff)
cli/lib: remove support for GMime 2.4
It's becoming a maintenance burden to do anything things with the crypto glue code twice, once for 2.4 and once for 2.6. I don't have any 2.4 version available to test on my development machine anymore, so the 2.4 specific code paths are likely not very well tested.
Diffstat (limited to 'crypto.c')
-rw-r--r--crypto.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/crypto.c b/crypto.c
index 026640fe..a6eb27db 100644
--- a/crypto.c
+++ b/crypto.c
@@ -20,8 +20,6 @@
#include "notmuch-client.h"
-#ifdef GMIME_ATLEAST_26
-
/* Create a GPG context (GMime 2.6) */
static notmuch_crypto_context_t *
create_gpg_context (const char *gpgpath)
@@ -39,29 +37,6 @@ create_gpg_context (const char *gpgpath)
return gpgctx;
}
-#else /* GMIME_ATLEAST_26 */
-
-/* Create a GPG context (GMime 2.4) */
-static notmuch_crypto_context_t *
-create_gpg_context (const char* gpgpath)
-{
- GMimeSession *session;
- notmuch_crypto_context_t *gpgctx;
-
- session = g_object_new (g_mime_session_get_type (), NULL);
- gpgctx = g_mime_gpg_context_new (session, gpgpath ? gpgpath : "gpg");
- g_object_unref (session);
-
- if (! gpgctx)
- return NULL;
-
- g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE);
-
- return gpgctx;
-}
-
-#endif /* GMIME_ATLEAST_26 */
-
/* for the specified protocol return the context pointer (initializing
* if needed) */
notmuch_crypto_context_t *