projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we don't want this warning, as it is default now, and that some people may
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
4d5cd09
..
2da13d7
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-97,7
+97,7
@@
static void append_signature (FILE * f)
fprintf (f, "\n%s", SignOffString);
}
fprintf (f, "\n%s", SignOffString);
}
- if (
Signature && (tmpfp = mutt_open_read (Signature
, &thepid))) {
+ if (
(tmpfp = mutt_open_read(NONULL(MAlias.signature)
, &thepid))) {
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
else if (SignOffString)
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
else if (SignOffString)
@@
-449,11
+449,6
@@
static int include_forward (CONTEXT * ctx, HEADER * cur, FILE * out)
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
- if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_forward_intro (out, cur);
if (option (OPTFORWDECODE)) {
mutt_forward_intro (out, cur);
if (option (OPTFORWDECODE)) {
@@
-498,11
+493,6
@@
static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
int chflags = CH_DECODE;
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
int chflags = CH_DECODE;
- if ((cur->security & ENCRYPT)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
@@
-1022,8
+1012,8
@@
address_t *mutt_default_from (void)
* Is this the right thing to do?
*/
* Is this the right thing to do?
*/
- if (
F
rom)
- adr = address_dup(
F
rom);
+ if (
MAlias.f
rom)
+ adr = address_dup(
MAlias.f
rom);
else if (MCore.use_domain) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();
else if (MCore.use_domain) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();
@@
-1373,12
+1363,6
@@
int ci_send_message (int flags, /* send mode */
if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
&& (cur->security & ENCRYPT))
msg->security |= SIGN;
if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
&& (cur->security & ENCRYPT))
msg->security |= SIGN;
- if (msg->security & (ENCRYPT | SIGN)) {
- if (option (OPTPGPAUTOINLINE))
- msg->security |= INLINE;
- if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
- msg->security |= INLINE;
- }
if (msg->security) {
/*
if (msg->security) {
/*