X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=crypto.c;h=a6eb27db7f630c131149377f7e51a190df86f613;hp=026640fee8b2cd5006becda9f0ff76ce801f4847;hb=005c2f0df17de8afdf9f67b923d26f2358236171;hpb=cb08a2ee019e52dc29ba393d139fce8d7282c632 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 *