Rocco Rutte:

- merge in latest mutt changes

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

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index b77b975..4c22836 100644 (file)
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,8 @@
+2005-08-14 02:22:47  Bernd Ahlers  <bernd@ba-net.org>  (brendan)
+
+       * cryptglue.c, mutt_sasl.c, smime.c: Fix some S/MIME spelling
+       inconsistencies.
+
 2005-08-12 23:06:25  Brendan Cully  <brendan@kublai.com>  (brendan)
 
        * mutt_ssl_gnutls.c: Turn off input buffering for gnutls SSL

diff --git a/cryptglue.c b/cryptglue.c
index 402ad6e..d73ddcd 100644 (file)
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -102,7 +102,7 @@ void crypt_invoke_message (int type)
     mutt_message _("Invoking PGP...");
   }
   else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
-    mutt_message _("Invoking SMIME...");
+    mutt_message _("Invoking S/MIME...");
   }
 }
 \f

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 095a9ae..b615a52 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -133,7 +133,7 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen,
 #endif
 
 /* mutt_sasl_start: called before doing a SASL exchange - initialises library
- *   (if neccessary). */
+ *   (if necessary). */
 int mutt_sasl_start (void)
 {
   static unsigned char sasl_init = 0;
@@ -288,7 +288,6 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn)
     return -1;
   }
 
-#if defined(USE_SSL) || defined(USE_GNUTLS)
   if (conn->ssf) {
 #ifdef USE_SASL2                /* I'm not sure this actually has an effect, at least with SASLv2 */
     debug_print (2, ("External SSF: %d\n", conn->ssf));
@@ -312,7 +311,6 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn)
     }
 #endif
   }
-#endif
 
   return 0;
 }

diff --git a/smime.c b/smime.c
index aeef863..4dc14f6 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -106,7 +106,7 @@ int smime_valid_passphrase (void)
 
   smime_void_passphrase ();
 
-  if (mutt_get_field_unbuffered (_("Enter SMIME passphrase:"), SmimePass,
+  if (mutt_get_field_unbuffered (_("Enter S/MIME passphrase:"), SmimePass,
                                  sizeof (SmimePass), M_PASS) == 0) {
     SmimeExptime = time (NULL) + SmimeTimeout;
     return (1);