+2005-07-29 06:45:14 Brendan Cully <brendan@kublai.com> (brendan)
+
+ * mutt_ssl_gnutls.c: Tweak a poorly-worded error message in the
+ gnutls glue, pointed out by Vincent Lefevre.
+
+2005-07-29 01:51:36 Brendan Cully <brendan@kublai.com> (brendan)
+
+ * imap/imap.c: Fix bug added in revision 3.26, where
+ imap_sync_mailbox failed to check whether it was supposed to
+ expunge before issuing a CLOSE.
+
+2005-07-28 20:42:45 ttakah@lapis.plala.or.jp (roessler)
+
+ * crypt-gpgme.c: Fix mutt/2004; S/MIME user interface differences
+ between GPGME and classic.
+
2005-07-28 19:47:40 Brendan Cully <brendan@kublai.com> (brendan)
* imap/auth_cram.c, imap/auth_login.c: Use mutt_account_getlogin
if (is_smime)
choice =
mutt_multi_choice (_
- ("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"),
- _("esabtf"));
+ ("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"),
+ _("esabpfc"));
else
choice =
mutt_multi_choice (_
- ("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"),
- _("esabtf"));
+ ("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"),
+ _("esabmfc"));
switch (choice) {
case 1: /* (e)ncrypt */
msg->security |= (is_smime ? SMIMEENCRYPT : PGPENCRYPT);
+ msg->security &= ~(is_smime ? SMIMESIGN : PGPSIGN);
break;
case 2: /* (s)ign */
msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
+ msg->security &= ~(is_smime ? SMIMEENCRYPT : PGPENCRYPT);
break;
case 3: /* sign (a)s */
msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
}
+#if 0
else {
msg->security &= (is_smime ? ~SMIMESIGN : ~PGPSIGN);
}
+#endif
*redraw = REDRAW_FULL;
break;
(is_smime ? (SMIMEENCRYPT | SMIMESIGN) : (PGPENCRYPT | PGPSIGN));
break;
- case 5: /* (t)oggle */
+ case 5: /* (p)gp or s/(m)ime */
is_smime = !is_smime;
break;
- case 6: /* (f)orget it */
+ case 6: /* (c)lear */
msg->security = 0;
break;
}
- if (choice == 6);
+ if (choice == 6 || choice == 7);
else if (is_smime) {
msg->security &= ~APPLICATION_PGP;
msg->security |= APPLICATION_SMIME;
}
}
- if (ctx->closing) {
+ if (expunge && ctx->closing) {
if (imap_exec (idata, "CLOSE", 0))
mutt_error (_("CLOSE failed"));
idata->state = IMAP_AUTHENTICATED;
/* We only support X.509 certificates (not OpenPGP) at the moment */
if (gnutls_certificate_type_get (state) != GNUTLS_CRT_X509) {
- mutt_error (_("Error certificate is not X.509"));
+ mutt_error (_("Certificate is not X.509"));
mutt_sleep (2);
return 0;
}