diff options
Diffstat (limited to 'mail/send.c')
| -rw-r--r-- | mail/send.c | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/mail/send.c b/mail/send.c index 72ebd3608..63d9d3026 100644 --- a/mail/send.c +++ b/mail/send.c @@ -619,10 +619,10 @@ add_attachments (compose_env_t *env, mu_message_t *pmsg) static void read_cc_bcc (compose_env_t *env) { - if (mailvar_get (NULL, "askcc", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("askcc")) compose_header_set (env, MU_HEADER_CC, ml_readline_with_intr ("Cc: "), COMPOSE_REPLACE); - if (mailvar_get (NULL, "askbcc", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("askbcc")) compose_header_set (env, MU_HEADER_BCC, ml_readline_with_intr ("Bcc: "), COMPOSE_REPLACE); } @@ -655,7 +655,7 @@ mail_send (int argc, char **argv) if (interactive) compose_header_set (&env, MU_HEADER_TO, ml_readline_with_intr ("To: "), COMPOSE_REPLACE); - else if (!mailvar_get (NULL, "editheaders", mailvar_type_boolean, 0)) + else if (mailvar_is_true ("editheaders")) { if (parse_headers (mu_strin, &env) != parse_headers_ok) { @@ -710,10 +710,10 @@ mail_send (int argc, char **argv) if (interactive) { - if (mailvar_get (NULL, "mailx", mailvar_type_boolean, 0)) + if (!mailvar_is_true ("mailx")) read_cc_bcc (&env); - if (mailvar_get (NULL, "asksub", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("asksub")) compose_header_set (&env, MU_HEADER_SUBJECT, ml_readline_with_intr ("Subject: "), COMPOSE_REPLACE); @@ -859,8 +859,7 @@ compose_header_set (compose_env_t *env, const char *name, switch (mode) { case COMPOSE_REPLACE: - if (is_address_field (name) - && mailvar_get (NULL, "inplacealiases", mailvar_type_boolean, 0) == 0) + if (is_address_field (name) && mailvar_is_true ("inplacealiases")) { char *exp = alias_expand (value); status = mu_header_set_value (env->header, name, exp ? exp : value, 1); @@ -871,8 +870,7 @@ compose_header_set (compose_env_t *env, const char *name, break; case COMPOSE_APPEND: - if (is_address_field (name) - && mailvar_get (NULL, "inplacealiases", mailvar_type_boolean, 0) == 0) + if (is_address_field (name) && mailvar_is_true ("inplacealiases")) { char *exp = alias_expand (value); status = mu_header_append (env->header, name, exp ? exp : value); @@ -886,8 +884,7 @@ compose_header_set (compose_env_t *env, const char *name, if (mu_header_aget_value (env->header, name, &old_value) == 0 && old_value[0]) { - if (is_address_field (name) - && mailvar_get (NULL, "inplacealiases", mailvar_type_boolean, 0) == 0) + if (is_address_field (name) && mailvar_is_true ("inplacealiases")) { char *exp = alias_expand (value); status = util_merge_addresses (&old_value, exp ? exp : value); @@ -971,7 +968,7 @@ fill_body (mu_message_t msg, mu_stream_t instr) if (n == 0) { - if (mailvar_get (NULL, "nullbody", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("nullbody")) { char *str; if (mailvar_get (&str, "nullbodymsg", mailvar_type_string, 0) == 0) @@ -987,7 +984,7 @@ fill_body (mu_message_t msg, mu_stream_t instr) static int save_dead_message_env (compose_env_t *env) { - if (mailvar_get (NULL, "save", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("save")) { mu_stream_t dead_letter, str; int rc; @@ -1005,8 +1002,7 @@ save_dead_message_env (compose_env_t *env) mu_error (_("Cannot open file %s: %s"), name, strerror (rc)); return 1; } - if (mailvar_get (NULL, "appenddeadletter", - mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("appenddeadletter")) mu_stream_seek (dead_letter, 0, MU_SEEK_END, NULL); else mu_stream_truncate (dead_letter, 0); @@ -1039,7 +1035,7 @@ save_dead_message_env (compose_env_t *env) static int save_dead_message (mu_message_t msg) { - if (mailvar_get (NULL, "save", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("save")) { mu_stream_t dead_letter, str; int rc; @@ -1057,8 +1053,7 @@ save_dead_message (mu_message_t msg) mu_error (_("Cannot open file %s: %s"), name, strerror (rc)); return 1; } - if (mailvar_get (NULL, "appenddeadletter", - mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("appenddeadletter")) mu_stream_seek (dead_letter, 0, MU_SEEK_END, NULL); else mu_stream_truncate (dead_letter, 0); @@ -1117,7 +1112,7 @@ send_message (mu_message_t msg) } } - if (mailvar_get (NULL, "verbose", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("verbose")) { mu_debug_set_category_level (MU_DEBCAT_MAILER, MU_DEBUG_LEVEL_UPTO (MU_DEBUG_PROT)); @@ -1188,7 +1183,7 @@ mail_send0 (compose_env_t *env, int save_to) if (ml_got_interrupt ()) { - if (mailvar_get (NULL, "ignore", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("ignore")) { mu_printf ("@\n"); } @@ -1205,12 +1200,11 @@ mail_send0 (compose_env_t *env, int save_to) if (!buf) { - if (interactive - && mailvar_get (NULL, "ignoreeof", mailvar_type_boolean, 0) == 0) + if (interactive && mailvar_is_true ("ignoreeof")) { - mu_error (mailvar_get (NULL, "dot", mailvar_type_boolean, 0) == 0 ? - _("Use \".\" to terminate letter.") : - _("Use \"~.\" to terminate letter.")); + mu_error (mailvar_is_true ("dot") + ? _("Use \".\" to terminate letter.") + : _("Use \"~.\" to terminate letter.")); continue; } else @@ -1219,8 +1213,7 @@ mail_send0 (compose_env_t *env, int save_to) int_cnt = 0; - if (strcmp (buf, ".") == 0 - && mailvar_get (NULL, "dot", mailvar_type_boolean, 0) == 0) + if (strcmp (buf, ".") == 0 && mailvar_is_true ("dot")) done = 1; else if (mailvar_get (&escape, "escape", mailvar_type_string, 0) == 0 && buf[0] == escape[0]) @@ -1276,13 +1269,12 @@ mail_send0 (compose_env_t *env, int save_to) /* In mailx compatibility mode, ask for Cc and Bcc after editing the body of the message */ - if (mailvar_get (NULL, "mailx", mailvar_type_boolean, 0) == 0) + if (mailvar_is_true ("mailx")) read_cc_bcc (env); /* Prepare the header */ - if (mailvar_get (NULL, "xmailer", mailvar_type_boolean, 0) == 0) - mu_header_set_value (env->header, MU_HEADER_X_MAILER, - program_version, 1); + if (mailvar_is_true ("xmailer")) + mu_header_set_value (env->header, MU_HEADER_X_MAILER, program_version, 1); if (util_header_expand (&env->header) == 0) { |