cli/lib: remove support for GMime 2.4

[notmuch] / crypto.c

diff --git a/crypto.c b/crypto.c
index fbe5aeb6b3968168bb9cdd95bf3269f42b53b4ed..a6eb27db7f630c131149377f7e51a190df86f613 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -20,6 +20,23 @@
 
 #include "notmuch-client.h"
 
+/* Create a GPG context (GMime 2.6) */
+static notmuch_crypto_context_t *
+create_gpg_context (const char *gpgpath)
+{
+    notmuch_crypto_context_t *gpgctx;
+
+    /* TODO: GMimePasswordRequestFunc */
+    gpgctx = g_mime_gpg_context_new (NULL, gpgpath ? gpgpath : "gpg");
+    if (! gpgctx)
+       return NULL;
+
+    g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, TRUE);
+    g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE);
+
+    return gpgctx;
+}
+
 /* for the specified protocol return the context pointer (initializing
  * if needed) */
 notmuch_crypto_context_t *
@@ -27,31 +44,25 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)
 {
     notmuch_crypto_context_t *cryptoctx = NULL;
 
+    if (! protocol) {
+       fprintf (stderr, "Cryptographic protocol is empty.\n");
+       return cryptoctx;
+    }
+
     /* As per RFC 1847 section 2.1: "the [protocol] value token is
      * comprised of the type and sub-type tokens of the Content-Type".
      * As per RFC 1521 section 2: "Content-Type values, subtypes, and
      * parameter names as defined in this document are
      * case-insensitive."  Thus, we use strcasecmp for the protocol.
      */
-    if ((strcasecmp (protocol, "application/pgp-signature") == 0)
-       || (strcasecmp (protocol, "application/pgp-encrypted") == 0)) {
-       if (!crypto->gpgctx) {
-#ifdef GMIME_ATLEAST_26
-           /* TODO: GMimePasswordRequestFunc */
-           crypto->gpgctx = g_mime_gpg_context_new (NULL, "gpg");
-#else
-           GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
-           crypto->gpgctx = g_mime_gpg_context_new (session, "gpg");
-           g_object_unref (session);
-#endif
-           if (crypto->gpgctx) {
-               g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) crypto->gpgctx, FALSE);
-           } else {
+    if (strcasecmp (protocol, "application/pgp-signature") == 0 ||
+       strcasecmp (protocol, "application/pgp-encrypted") == 0) {
+       if (! crypto->gpgctx) {
+           crypto->gpgctx = create_gpg_context (crypto->gpgpath);
+           if (! crypto->gpgctx)
                fprintf (stderr, "Failed to construct gpg context.\n");
-           }
        }
        cryptoctx = crypto->gpgctx;
-
     } else {
        fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");
     }