X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=f40332028d736397bf40747a120afb5169e2f686;hp=2da13d7fef71f1465d062418b88ebd9e7c5b6461;hb=c132f8f0ab91aefbe04086d886f7045901cf3200;hpb=64a23f5574b096605383ef1886c7d0d6c42aeeee

diff --git a/send.c b/send.c
index 2da13d7..f403320 100644
--- a/send.c
+++ b/send.c
@@ -19,7 +19,7 @@
 #include "alias.h"
 #include "keymap.h"
 #include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 #include "mutt_idna.h"
 #include "attach.h"
 
@@ -477,17 +477,6 @@ void mutt_make_attribution (CONTEXT * ctx, HEADER * cur, FILE * out)
   }
 }
 
-void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
-{
-  char buffer[STRING];
-
-  if (PostIndentString) {
-    mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
-    fputs (buffer, out);
-    fputc ('\n', out);
-  }
-}
-
 static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
 {
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
@@ -495,7 +484,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
 
   mutt_parse_mime_message (ctx, cur);
   mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
-
   mutt_make_attribution (ctx, cur, out);
 
   if (!option (OPTHEADER))
@@ -506,9 +494,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
   }
 
   mutt_copy_message (out, ctx, cur, cmflags, chflags);
-
-  mutt_make_post_indent (ctx, cur, out);
-
   return 0;
 }
 
@@ -900,15 +885,6 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
     else if (i == -1)
       return -1;
   }
-  else if (flags & SENDKEY) {
-    BODY *btmp;
-
-    if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
-      return -1;
-
-    btmp->next = msg->content;
-    msg->content = btmp;
-  }
 
   mutt_clear_error ();
 
@@ -1210,7 +1186,7 @@ int ci_send_message (int flags, /* send mode */
     address_list_wipe(&msg->env->from);
   }
 
-  if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
+  if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
     pbody = body_new();
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
@@ -1344,8 +1320,7 @@ int ci_send_message (int flags, /* send mode */
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
-    if (!(flags & SENDKEY))
-      append_signature (tempfp);
+    append_signature (tempfp);
 
     /* 
      * this wants to be done _after_ generate_body, so message-hooks
@@ -1414,8 +1389,7 @@ int ci_send_message (int flags, /* send mode */
       && !(flags & (SENDRESEND | SENDPOSTPONED)))
     msg->env->from->personal = m_strdup(Realname);
 
-  if (!(flags & SENDKEY))
-    m_fclose(&tempfp);
+  m_fclose(&tempfp);
 
   if (!(flags & SENDBATCH)) {
     struct stat st;
@@ -1433,11 +1407,11 @@ int ci_send_message (int flags, /* send mode */
      *    setting of $forward_edit because the user probably needs to add the
      *    recipients.
      */
-    if (!(flags & SENDKEY) &&
-        ((flags & SENDFORWARD) == 0 ||
+    if (((flags & SENDFORWARD) == 0 ||
          (option (OPTEDITHDRS) && option (OPTAUTOEDIT)) ||
          query_quadoption (OPT_FORWEDIT,
-                           _("Edit forwarded message?")) == M_YES)) {
+                           _("Edit forwarded message?")) == M_YES))
+    {
       /* If the this isn't a text message, look for a mailcap edit command */
       if (rfc1524_mailcap_isneeded(msg->content)) {
         if (!mutt_edit_attachment (msg->content))
@@ -1463,7 +1437,7 @@ int ci_send_message (int flags, /* send mode */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
     }
 
-    if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDKEY | SENDRESEND))) {
+    if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDRESEND))) {
       if (stat (msg->content->filename, &st) == 0) {
         /* if the file was not modified, bail out now */
         if (mtime == st.st_mtime && !msg->content->next &&