X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=f786e5c137e0938eebe726af65e407c7b268c696;hp=269d98d0c25e5ed646a4c598bdb2a815ef6ad98c;hb=6d2a5b1e45ea9606d27a23c068bd4e8e5f94f341;hpb=16534e98723674fa391e3fc29d2a07ce419c13dd

diff --git a/send.c b/send.c
index 269d98d..f786e5c 100644
--- a/send.c
+++ b/send.c
@@ -97,7 +97,7 @@ static void append_signature (FILE * f)
     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)
@@ -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);
 
-  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)) {
@@ -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;
 
-  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);
 
@@ -1022,8 +1012,8 @@ address_t *mutt_default_from (void)
    * Is this the right thing to do?
    */
 
-  if (From)
-    adr = address_dup(From);
+  if (MAlias.from)
+    adr = address_dup(MAlias.from);
   else if (MCore.use_domain) {
     const char *fqdn = mutt_fqdn (1);
     adr = address_new();
@@ -1349,16 +1339,12 @@ int ci_send_message (int flags, /* send mode */
     if (option (OPTHDRS))
       process_user_header (msg->env);
 
-
-    if (option (OPTSIGONTOP) && (!(flags & SENDKEY)))
-      append_signature (tempfp);
-
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
-    if (!option (OPTSIGONTOP) && (!(flags & SENDKEY)))
+    if (!(flags & SENDKEY))
       append_signature (tempfp);
 
     /*