X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=d17cdf01567ac89c91a99a55c49cad8f11e5ec82;hp=62d4bcec0b75e16a266dea4e40ce9ecd1f0cbaa9;hb=886c0b1666478548485682fbcaa667bb3cc0f138;hpb=331310c4bae664e557909805db25239bb14ec484 diff --git a/notmuch-client.h b/notmuch-client.h index 62d4bcec..d17cdf01 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -24,6 +24,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE /* for getline */ #endif +#include #include #include @@ -31,10 +32,6 @@ #include "gmime-extra.h" -typedef GMimeCryptoContext notmuch_crypto_context_t; -/* This is automatically included only since gmime 2.6.10 */ -#include - #include "notmuch.h" /* This is separate from notmuch-private.h because we're trying to @@ -54,6 +51,7 @@ typedef GMimeCryptoContext notmuch_crypto_context_t; #include #include "talloc-extra.h" +#include "crypto.h" #define unused(x) x __attribute__ ((unused)) @@ -71,21 +69,13 @@ typedef struct notmuch_show_format { const struct notmuch_show_params *params); } notmuch_show_format_t; -typedef struct notmuch_crypto { - notmuch_crypto_context_t* gpgctx; - notmuch_crypto_context_t* pkcs7ctx; - notmuch_bool_t verify; - notmuch_bool_t decrypt; - const char *gpgpath; -} notmuch_crypto_t; - typedef struct notmuch_show_params { - notmuch_bool_t entire_thread; - notmuch_bool_t omit_excluded; - notmuch_bool_t output_body; + bool entire_thread; + bool omit_excluded; + bool output_body; int part; - notmuch_crypto_t crypto; - notmuch_bool_t include_html; + _notmuch_crypto_t crypto; + bool include_html; GMimeStream *out_stream; } notmuch_show_params_t; @@ -145,7 +135,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 @@ -178,12 +168,6 @@ typedef struct _notmuch_config notmuch_config_t; void notmuch_exit_if_unsupported_format (void); -notmuch_crypto_context_t * -notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol); - -int -notmuch_crypto_cleanup (notmuch_crypto_t *crypto); - int notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]); @@ -196,6 +180,9 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]); int notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]); +int +notmuch_reindex_command (notmuch_config_t *config, int argc, char *argv[]); + int notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]); @@ -240,12 +227,12 @@ show_one_part (const char *filename, int part); void format_part_sprinter (const void *ctx, struct sprinter *sp, mime_node_t *node, - notmuch_bool_t first, notmuch_bool_t output_body, - notmuch_bool_t include_html); + bool output_body, + bool include_html); void format_headers_sprinter (struct sprinter *sp, GMimeMessage *message, - notmuch_bool_t reply); + bool reply); typedef enum { NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0, @@ -279,7 +266,7 @@ notmuch_config_close (notmuch_config_t *config); int notmuch_config_save (notmuch_config_t *config); -notmuch_bool_t +bool notmuch_config_is_new (notmuch_config_t *config); const char * @@ -289,12 +276,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); @@ -336,12 +325,12 @@ notmuch_config_set_new_ignore (notmuch_config_t *config, const char *new_ignore[], size_t length); -notmuch_bool_t +bool notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config); void notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, - notmuch_bool_t synchronize_flags); + bool synchronize_flags); const char ** notmuch_config_get_search_exclude_tags (notmuch_config_t *config, size_t *length); @@ -354,7 +343,7 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config, int notmuch_run_hook (const char *db_path, const char *hook); -notmuch_bool_t +bool debugger_is_active (void); /* mime-node.c */ @@ -397,14 +386,14 @@ struct mime_node { int part_num; /* True if decryption of this part was attempted. */ - notmuch_bool_t decrypt_attempted; + bool decrypt_attempted; /* True if decryption of this part's child succeeded. In this * case, the decrypted part is substituted for the second child of * this part (which would usually be the encrypted data). */ - notmuch_bool_t decrypt_success; + bool decrypt_success; /* True if signature verification on this part was attempted. */ - notmuch_bool_t verify_attempted; + bool verify_attempted; /* The list of signatures for signed or encrypted containers. If * there are no signatures, this will be NULL. */ @@ -439,7 +428,7 @@ struct mime_node { */ notmuch_status_t mime_node_open (const void *ctx, notmuch_message_t *message, - notmuch_crypto_t *crypto, mime_node_t **node_out); + _notmuch_crypto_t *crypto, mime_node_t **node_out); /* Return a new MIME node for the requested child part of parent. * parent will be used as the talloc context for the returned child @@ -478,7 +467,7 @@ notmuch_database_dump (notmuch_database_t *notmuch, const char *query_str, dump_format_t output_format, dump_include_t include, - notmuch_bool_t gzip_output); + bool gzip_output); /* If status is non-zero (i.e. error) print appropriate messages to stderr. @@ -499,7 +488,7 @@ status_to_exit (notmuch_status_t status); #include "command-line-arguments.h" -extern char *notmuch_requested_db_uuid; +extern const char *notmuch_requested_db_uuid; extern const notmuch_opt_desc_t notmuch_shared_options []; void notmuch_exit_if_unmatched_db_uuid (notmuch_database_t *notmuch);