X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=cryptglue.c;h=d76fa4468b4fc2d577dcc1043813bc5e76cc2de0;hp=d83b6122eb4cefc2ba71945b3bd50d4458c8fd8d;hb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/cryptglue.c b/cryptglue.c
index d83b612..d76fa44 100644
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -37,13 +37,8 @@
 
 */
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
 extern struct crypt_module_specs crypt_mod_pgp_classic;
-#endif
-
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
 extern struct crypt_module_specs crypt_mod_smime_classic;
-#endif
 
 #ifdef CRYPT_BACKEND_GPGME
 extern struct crypt_module_specs crypt_mod_pgp_gpgme;
@@ -52,7 +47,6 @@ extern struct crypt_module_specs crypt_mod_smime_gpgme;
 
 void crypt_init (void)
 {
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
   if (
 #ifdef CRYPT_BACKEND_GPGME
        (!option (OPTCRYPTUSEGPGME))
@@ -61,9 +55,7 @@ void crypt_init (void)
 #endif
     )
     crypto_module_register (&crypt_mod_pgp_classic);
-#endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
   if (
 #ifdef CRYPT_BACKEND_GPGME
        (!option (OPTCRYPTUSEGPGME))
@@ -72,7 +64,6 @@ void crypt_init (void)
 #endif
     )
     crypto_module_register (&crypt_mod_smime_classic);
-#endif
 
   if (option (OPTCRYPTUSEGPGME)) {
 #ifdef CRYPT_BACKEND_GPGME
@@ -99,10 +90,10 @@ void crypt_init (void)
 /* Show a message that a backend will be invoked. */
 void crypt_invoke_message (int type)
 {
-  if ((WithCrypto & APPLICATION_PGP) && (type & APPLICATION_PGP)) {
+  if (type & APPLICATION_PGP) {
     mutt_message _("Invoking PGP...");
   }
-  else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
+  else if (type & APPLICATION_SMIME) {
     mutt_message _("Invoking S/MIME...");
   }
 }