X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=2da13d7fef71f1465d062418b88ebd9e7c5b6461;hp=3bddf4e9328bb81632376ab1369059814f24cbf0;hb=132d06d5920f9a496a8623acfbbabe9739618489;hpb=05039d8ea34618b385736ae6d7578b1643fad3d2

diff --git a/send.c b/send.c
index 3bddf4e..2da13d7 100644
--- a/send.c
+++ b/send.c
@@ -97,7 +97,7 @@ static void append_signature (FILE * f)
     fprintf (f, "\n%s", SignOffString);
   }
 
-  if (tmpfp = mutt_open_read(NONULL(MAlias.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);
 
@@ -1373,12 +1363,6 @@ int ci_send_message (int flags, /* send mode */
     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) {
       /*