From c67f6cdd70b0397771def51109376639fac9dc1b Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Thu, 24 Jan 2002 22:39:13 +0000 Subject: [PATCH] S/MIME nits. --- crypt.c | 4 ++-- curs_lib.c | 3 +++ smime.c | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/crypt.c b/crypt.c index 43164b318..0f2f3f0b2 100644 --- 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 8e8307990..4feb9de4a 100644 --- 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 2e2411ea9..e6a25a893 100644 --- 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); } -- 2.40.0