debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-29 06:04:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://notmuchmail.org/git/notmuch

Browse source
This commit is contained in:
Sebastian Spaeth 2012-01-09 17:25:19 +01:00
commit 980daa26b5
2 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emacs/notmuch.el
View file

@ -438,7 +438,7 @@ Complete list of currently available key bindings:
"*") "*")
32 nil nil t)) 32 nil nil t))
crypto-switch) crypto-switch)
(error "End of search results")))) (message "End of search results."))))
(defun notmuch-search-reply-to-thread (&optional prompt-for-sender) (defun notmuch-search-reply-to-thread (&optional prompt-for-sender)
"Begin composing a reply to the entire current thread in a new buffer." "Begin composing a reply to the entire current thread in a new buffer."

79
notmuch-reply.c
View file

@ -612,62 +612,61 @@ notmuch_reply_format_headers_only(void *ctx,
return 0; return 0;
} }
enum {
FORMAT_DEFAULT,
FORMAT_HEADERS_ONLY,
};
int int
notmuch_reply_command (void *ctx, int argc, char *argv[]) notmuch_reply_command (void *ctx, int argc, char *argv[])
{ {
notmuch_config_t *config; notmuch_config_t *config;
notmuch_database_t *notmuch; notmuch_database_t *notmuch;
notmuch_query_t *query; notmuch_query_t *query;
char *opt, *query_string; char *query_string;
int i, ret = 0; int opt_index, ret = 0;
int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params); int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params);
notmuch_show_params_t params; notmuch_show_params_t params = { .part = -1 };
int format = FORMAT_DEFAULT;
notmuch_bool_t decrypt = FALSE;
reply_format_func = notmuch_reply_format_default; notmuch_opt_desc_t options[] = {
params.part = -1; { NOTMUCH_OPT_KEYWORD, &format, "format", 'f',
params.cryptoctx = NULL; (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT },
{ "headers-only", FORMAT_HEADERS_ONLY },
{ 0, 0 } } },
{ NOTMUCH_OPT_BOOLEAN, &decrypt, "decrypt", 'd', 0 },
{ 0, 0, 0, 0, 0 }
};
argc--; argv++; /* skip subcommand argument */ opt_index = parse_arguments (argc, argv, options, 1);
if (opt_index < 0) {
for (i = 0; i < argc && argv[i][0] == '-'; i++) { /* diagnostics already printed */
if (strcmp (argv[i], "--") == 0) { return 1;
i++;
break;
}
if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {
opt = argv[i] + sizeof ("--format=") - 1;
if (strcmp (opt, "default") == 0) {
reply_format_func = notmuch_reply_format_default;
} else if (strcmp (opt, "headers-only") == 0) {
reply_format_func = notmuch_reply_format_headers_only;
} else {
fprintf (stderr, "Invalid value for --format: %s\n", opt);
return 1;
}
} else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
if (params.cryptoctx == NULL) {
GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL);
if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
fprintf (stderr, "Failed to construct gpg context.\n");
else
g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE);
g_object_unref (session);
session = NULL;
}
} else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
}
} }
argc -= i; if (format == FORMAT_HEADERS_ONLY)
argv += i; reply_format_func = notmuch_reply_format_headers_only;
else
reply_format_func = notmuch_reply_format_default;
if (decrypt) {
GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
params.cryptoctx = g_mime_gpg_context_new (session, "gpg");
if (params.cryptoctx) {
g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE);
params.decrypt = TRUE;
} else {
fprintf (stderr, "Failed to construct gpg context.\n");
}
g_object_unref (session);
}
config = notmuch_config_open (ctx, NULL, NULL); config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL) if (config == NULL)
return 1; return 1;
query_string = query_string_from_args (ctx, argc, argv); query_string = query_string_from_args (ctx, argc-opt_index, argv+opt_index);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");
return 1; return 1;