X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-client.h;h=11aefbb468cabb62401abfbfa1124720ee2179db;hb=f76a245009b8db6065d83a0e86df697003f41b77;hp=62d4bcec0b75e16a266dea4e40ce9ecd1f0cbaa9;hpb=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1;p=notmuch

diff --git a/notmuch-client.h b/notmuch-client.h
index 62d4bcec..11aefbb4 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -76,7 +76,9 @@ typedef struct notmuch_crypto {
     notmuch_crypto_context_t* pkcs7ctx;
     notmuch_bool_t verify;
     notmuch_bool_t decrypt;
+#if (GMIME_MAJOR_VERSION < 3)
     const char *gpgpath;
+#endif
 } notmuch_crypto_t;
 
 typedef struct notmuch_show_params {
@@ -145,7 +147,7 @@ chomp_newline (char *str)
  * this.  New (required) map fields can be added without increasing
  * this.
  */
-#define NOTMUCH_FORMAT_CUR 3
+#define NOTMUCH_FORMAT_CUR 4
 /* The minimum supported structured output format version.  Requests
  * for format versions below this will return an error. */
 #define NOTMUCH_FORMAT_MIN 1
@@ -289,12 +291,14 @@ void
 notmuch_config_set_database_path (notmuch_config_t *config,
 				  const char *database_path);
 
+#if (GMIME_MAJOR_VERSION < 3)
 const char *
 notmuch_config_get_crypto_gpg_path (notmuch_config_t *config);
 
 void
 notmuch_config_set_crypto_gpg_path (notmuch_config_t *config,
 				  const char *gpg_path);
+#endif
 
 const char *
 notmuch_config_get_user_name (notmuch_config_t *config);