Simplifications.

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index ca0efcc..beaac30 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -18,7 +18,6 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -64,7 +63,6 @@ int mutt_display_message (HEADER * cur)
   if (DisplayFilter && *DisplayFilter) {
     fpfilterout = fpout;
     fpout = NULL;
-    /* mutt_endwin (NULL); */
     filterpid = mutt_create_filter_fd (DisplayFilter, &fpout, NULL, NULL,
                                        -1, fileno (fpfilterout), -1);
     if (filterpid < 0) {
@@ -93,10 +91,6 @@ int mutt_display_message (HEADER * cur)
       }
     }
 
-    if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
-      crypt_invoke_message(cur->security);
-    }
-
     res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
                              (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
                              CH_DECODE | CH_FROM);
@@ -221,13 +215,10 @@ void ci_bounce_message (HEADER * h, int *redraw)
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
-    CLEARLINE(main_w, LINES - 1);
     mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE(main_w, LINES - 1);
-
   rc = mutt_bounce_message (NULL, h, adr);
   address_list_wipe(&adr);
   /* If no error, or background, display message. */
@@ -272,14 +263,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
   pid_t thepid;
   FILE *fpout;
 
-/*   mutt_endwin (NULL); 
-
-     is this really needed here ? 
-     it makes the screen flicker on pgp and s/mime messages,
-     before asking for a passphrase...
-                                     Oliver Ehli */
   if (h) {
-
     mutt_message_hook (Context, h, M_MESSAGEHOOK);
 
     if (decode) {
@@ -296,9 +280,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
     pipe_msg (h, fpout, decode, print);
     m_fclose(&fpout);
     rc = mutt_wait_filter (thepid);
-  }
-  else {                        /* handle tagged messages */
-
+  } else {                        /* handle tagged messages */
     if (decode) {
       for (i = 0; i < Context->vcount; i++)
         if (Context->hdrs[Context->v2r[i]]->tagged) {
@@ -328,8 +310,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
             rc = 1;
         }
       }
-    }
-    else {
+    } else {
       mutt_endwin (NULL);
       if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
         mutt_perror (_("Can't create filter process"));
@@ -465,7 +446,6 @@ void mutt_shell_escape (void)
     if (!buf[0])
       m_strcpy(buf, sizeof(buf), mod_core.shell);
     if (buf[0]) {
-      CLEARLINE(main_w, LINES - 1);
       mutt_endwin (NULL);
       fflush (stdout);
       if (mutt_system (buf) != 0 || option (OPTWAITKEY))
@@ -715,11 +695,6 @@ int mutt_save_message (HEADER * h, int delete,
   return -1;
 }
 
-void mutt_version (void)
-{
-  mutt_message (mutt_make_version());
-}
-
 void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 {
   char buf[LONG_STRING];