X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=f15ca1c5e8632b331028766a3703bbf791c90a44;hp=ca0efcc5922a0fdb982e06f654dade9031119790;hb=e6131516658a6c59a5bf1fe5fb73a9d1714a6f02;hpb=8ab1ab66eb1c4b95f9b2a5ed9c2b2cf1dfa74544

diff --git a/commands.c b/commands.c
index ca0efcc..f15ca1c 100644
--- 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"));
@@ -452,7 +433,7 @@ int mutt_select_sort (int reverse)
   if (reverse)
     Sort |= SORT_REVERSE;
 
-  return (Sort != method ? 0 : -1);     /* no need to resort if it's the same */
+  return Sort != method ? 0 : -1;     /* no need to resort if it's the same */
 }
 
 /* invoke a command in a subshell */
@@ -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))
@@ -577,7 +557,7 @@ int _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode,
       mutt_set_flag (Context, h, M_TAG, 0);
     mutt_set_flag (Context, h, M_APPENDED, 1);
   }
-  return (0);
+  return 0;
 }
 
 /* returns 0 if the copy/save was successful, or -1 on error/abort */
@@ -630,7 +610,7 @@ int mutt_save_message (HEADER * h, int delete,
 
   mutt_pretty_mailbox (buf);
   if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1)
-    return (-1);
+    return -1;
 
   if (*redraw != REDRAW_FULL) {
     if (!h)
@@ -640,7 +620,7 @@ int mutt_save_message (HEADER * h, int delete,
   }
 
   if (!buf[0])
-    return (-1);
+    return -1;
 
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de>
@@ -677,7 +657,7 @@ int mutt_save_message (HEADER * h, int delete,
     if (h) {
       if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) {
         mx_close_mailbox (&ctx, NULL);
-        return (-1);
+        return -1;
       }
     } else {
       for (i = 0; i < Context->vcount; i++) {
@@ -687,7 +667,7 @@ int mutt_save_message (HEADER * h, int delete,
           if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete,
                                   decode, decrypt) != 0) {
             mx_close_mailbox (&ctx, NULL);
-            return (-1);
+            return -1;
           }
         }
       }
@@ -709,17 +689,12 @@ int mutt_save_message (HEADER * h, int delete,
     }
 
     mutt_clear_error ();
-    return (0);
+    return 0;
   }
 
   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];