S/MIME nits.

diff --git a/crypt.c b/crypt.c
index 43164b31842c092559c30d38251b07511713644b..0f2f3f0b236fa44ed2524f7e2f3ceace9a853a19 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -515,7 +515,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
           mbox = tmp ? tmp->mailbox : NULL;
          if (mbox)
          {
-           mutt_endwin (_("Trying to extract S/MIME certificates...\n"));
+           mutt_message (_("Trying to extract S/MIME certificates...\n"));
            smime_invoke_import (tempfname, mbox);
            tmp = NULL;
          }
@@ -535,7 +535,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
       {
        mutt_copy_message (fpout, Context, h, M_CM_DECODE|M_CM_CHARCONV, 0);
        fflush(fpout);
-       mutt_message (_("Trying to extract PGP keys...\n"));
+       mutt_endwin (_("Trying to extract PGP keys...\n"));
        pgp_invoke_import (tempfname);
       }
 #endif  

diff --git a/curs_lib.c b/curs_lib.c
index 8e8307990fb0a435f19689d4cfc53185dd3d2761..4feb9de4ab989b484be3e1c277fdf36338b2353c 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -314,7 +314,10 @@ void mutt_endwin (const char *msg)
   }
   
   if (msg && *msg)
+  {
     puts (msg);
+    fflush (stdout);
+  }
 }
 
 void mutt_perror (const char *s)

diff --git a/smime.c b/smime.c
index 2e2411ea92acfde0796770e796b90d55fb73220c..e6a25a89371462eb178aeb022f0bf6094b0d3a43 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -348,9 +348,9 @@ static void smime_entry (char *s, size_t l, MUTTMENU * menu, int num)
       truststate = N_("Unknown   ");
   }
   if (this.public)
-    snprintf(s, l, "0x%.8X%i %s %-35.35s %s", this.hash, this.suffix, _(truststate), this.email, this.nick);
+    snprintf(s, l, "  0x%.8X%i %s %-35.35s %s", this.hash, this.suffix, _(truststate), this.email, this.nick);
   else
-    snprintf(s, l, "0x%.8X%i %-35.35s %s", this.hash, this.suffix, this.email, this.nick);
+    snprintf(s, l, "  0x%.8X%i %-35.35s %s", this.hash, this.suffix, this.email, this.nick);
 }
 
 
@@ -669,7 +669,7 @@ void smime_getkeys (char *mailbox)
 
   if (!k)
   {
-    snprintf(buf, sizeof(buf), "Enter keyID for \'%s\':",
+    snprintf(buf, sizeof(buf), "Enter keyID for \'%s\': ",
             mailbox);
     k = smime_ask_for_key(buf, mailbox, 0);
   }