cli: convert notmuch_bool_t to stdbool

[notmuch] / crypto.c

diff --git a/crypto.c b/crypto.c
index 3e8ce7ca07740b3aea9491dee18c7859b8ac4df5..9c557d6e0640145dde75bc7ed926a70f55092ae6 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -19,7 +19,7 @@
  */
 
 #include "notmuch-client.h"
-
+#if (GMIME_MAJOR_VERSION < 3)
 /* Create a GPG context (GMime 2.6) */
 static notmuch_crypto_context_t *
 create_gpg_context (notmuch_crypto_t *crypto)
@@ -37,8 +37,8 @@ create_gpg_context (notmuch_crypto_t *crypto)
     }
     crypto->gpgctx = gpgctx;
 
-    g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, TRUE);
-    g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, FALSE);
+    g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) gpgctx, true);
+    g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) gpgctx, false);
 
     return gpgctx;
 }
@@ -61,7 +61,7 @@ create_pkcs7_context (notmuch_crypto_t *crypto)
     crypto->pkcs7ctx = pkcs7ctx;
 
     g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context *) pkcs7ctx,
-                                          FALSE);
+                                          false);
 
     return pkcs7ctx;
 }
@@ -132,3 +132,9 @@ notmuch_crypto_cleanup (notmuch_crypto_t *crypto)
 
     return 0;
 }
+#else
+int notmuch_crypto_cleanup (unused(notmuch_crypto_t *crypto))
+{
+    return 0;
+}
+#endif