From: nion <nion@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sat, 30 Jul 2005 11:21:17 +0000 (+0000)
Subject: Nico Golde:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=c36aba5f86a5001a110d21ba9766426f4806b17e

Nico Golde:
- merged in the latest mutt changes


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@366 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 0417064..0f58afe 100644
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,19 @@
+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
diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 03eb846..b9b7613 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -3827,21 +3827,23 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
   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 */
@@ -3856,9 +3858,11 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
 
       msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
     }
+#if 0
     else {
       msg->security &= (is_smime ? ~SMIMESIGN : ~PGPSIGN);
     }
+#endif
     *redraw = REDRAW_FULL;
     break;
 
@@ -3867,16 +3871,16 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
       (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;
diff --git a/imap/imap.c b/imap/imap.c
index 2a4dff5..6b37230 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1030,7 +1030,7 @@ int imap_sync_mailbox (CONTEXT * ctx, int expunge, int *index_hint)
     }
   }
 
-  if (ctx->closing) {
+  if (expunge && ctx->closing) {
     if (imap_exec (idata, "CLOSE", 0))
       mutt_error (_("CLOSE failed"));
     idata->state = IMAP_AUTHENTICATED;
diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 1080faf..0c4ea8e 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -485,7 +485,7 @@ static int tls_check_certificate (CONNECTION * conn)
 
   /* 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;
   }