Fix some S/MIME spelling inconsistencies.

diff --git a/cryptglue.c b/cryptglue.c
index e98e8625f2cace788478b48fc7eadc4b8636c322..ae4ecbf91063b7d621fa97c3ded67592a28718ce 100644 (file)
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -109,7 +109,7 @@ void crypt_invoke_message (int type)
   if ((WithCrypto & APPLICATION_PGP) && (type & APPLICATION_PGP))
     mutt_message _("Invoking PGP...");
   else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME))
-    mutt_message _("Invoking SMIME...");
+    mutt_message _("Invoking S/MIME...");
 }
 
 

diff --git a/mutt_sasl.c b/mutt_sasl.c
index ffdbf8e051ab0cb6af9658cf7e35b649a634c0e3..294dbc792cec0158437112cc2938f32d230099f3 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -136,7 +136,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;
@@ -224,7 +224,7 @@ int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn)
     return -1;
   }
 
-dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport));
+  dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport));
   
   rc = sasl_client_new (service, conn->account.host, iplocalport, ipremoteport,
     mutt_sasl_get_callbacks (&conn->account), 0, saslconn);
@@ -293,7 +293,6 @@ dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport))
     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 */
@@ -318,7 +317,6 @@ dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport))
     }
 #endif
   }
-#endif
 
   return 0;
 }

diff --git a/smime.c b/smime.c
index 476484e4c086e6dd9b143e51f84641c281af09d6..c4b462bac93aa78d19e00b65e1efe863218ee1fb 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -108,7 +108,7 @@ int smime_valid_passphrase (void)
 
   smime_void_passphrase();
   
-  if (mutt_get_password (_("Enter SMIME passphrase:"), SmimePass, sizeof (SmimePass)) == 0)
+  if (mutt_get_password (_("Enter S/MIME passphrase:"), SmimePass, sizeof (SmimePass)) == 0)
     {
       SmimeExptime = time (NULL) + SmimeTimeout;
       return (1);