* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/ .
+ * along with this program. If not, see https://www.gnu.org/licenses/ .
*
* Authors: Jameson Rollins <jrollins@finestructure.net>
*/
#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)
+static GMimeCryptoContext *
+create_gpg_context (_notmuch_crypto_t *crypto)
{
- notmuch_crypto_context_t *gpgctx;
+ GMimeCryptoContext *gpgctx;
if (crypto->gpgctx)
return crypto->gpgctx;
}
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;
}
/* Create a PKCS7 context (GMime 2.6) */
-static notmuch_crypto_context_t *
-create_pkcs7_context (notmuch_crypto_t *crypto)
+static GMimeCryptoContext *
+create_pkcs7_context (_notmuch_crypto_t *crypto)
{
- notmuch_crypto_context_t *pkcs7ctx;
+ GMimeCryptoContext *pkcs7ctx;
if (crypto->pkcs7ctx)
return crypto->pkcs7ctx;
crypto->pkcs7ctx = pkcs7ctx;
g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context *) pkcs7ctx,
- FALSE);
+ false);
return pkcs7ctx;
}
static const struct {
const char *protocol;
- notmuch_crypto_context_t *(*get_context) (notmuch_crypto_t *crypto);
+ GMimeCryptoContext *(*get_context) (_notmuch_crypto_t *crypto);
} protocols[] = {
{
.protocol = "application/pgp-signature",
/* for the specified protocol return the context pointer (initializing
* if needed) */
-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)
{
- notmuch_crypto_context_t *cryptoctx = NULL;
+ GMimeCryptoContext *cryptoctx = NULL;
size_t i;
if (! protocol) {
return NULL;
}
-int
-notmuch_crypto_cleanup (notmuch_crypto_t *crypto)
+void
+_notmuch_crypto_cleanup (_notmuch_crypto_t *crypto)
{
if (crypto->gpgctx) {
g_object_unref (crypto->gpgctx);
g_object_unref (crypto->pkcs7ctx);
crypto->pkcs7ctx = NULL;
}
-
- return 0;
}
+#else
+void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto))
+{
+}
+#endif