X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcryptglue.c;h=79fc2465143c89324794d6c314edf149833a3fcf;hp=5ea7ace5f72570e38f199f59340ae49b0f3c45b0;hb=777dc6d5374fd154ac626421c813961b8ab18f2d;hpb=678c4d550b27a06ba3c94ac5821fcf0291c33f8a

diff --git a/lib-crypt/cryptglue.c b/lib-crypt/cryptglue.c
index 5ea7ace..79fc246 100644
--- a/lib-crypt/cryptglue.c
+++ b/lib-crypt/cryptglue.c
@@ -29,56 +29,18 @@
     Generic
 */
 
-extern struct crypt_module_specs crypt_mod_pgp_classic;
-extern struct crypt_module_specs crypt_mod_smime_classic;
-
-#ifdef CRYPT_BACKEND_GPGME
 extern struct crypt_module_specs crypt_mod_pgp_gpgme;
 extern struct crypt_module_specs crypt_mod_smime_gpgme;
-#endif
 
 void crypt_init (void)
 {
-  if (
-#ifdef CRYPT_BACKEND_GPGME
-       (!option (OPTCRYPTUSEGPGME))
-#else
-       1
-#endif
-    )
-    crypto_module_register (&crypt_mod_pgp_classic);
-
-  if (
-#ifdef CRYPT_BACKEND_GPGME
-       (!option (OPTCRYPTUSEGPGME))
-#else
-       1
-#endif
-    )
-    crypto_module_register (&crypt_mod_smime_classic);
-
-  if (option (OPTCRYPTUSEGPGME)) {
-#ifdef CRYPT_BACKEND_GPGME
     crypto_module_register (&crypt_mod_pgp_gpgme);
     crypto_module_register (&crypt_mod_smime_gpgme);
-#else
-    mutt_message (_("\"crypt_use_gpgme\" set"
-                    " but not build with GPGME support."));
-    if (mutt_any_key_to_continue (NULL) == -1)
-      mutt_exit (1);
-#endif
-  }
-
-#if defined CRYPT_BACKEND_CLASSIG_PGP || defined CRYPT_BACKEND_CLASSIG_SMIME || defined CRYPT_BACKEND_GPGME
-  if (CRYPT_MOD_CALL_CHECK (PGP, init))
-    (CRYPT_MOD_CALL (PGP, init)) ();
 
-  if (CRYPT_MOD_CALL_CHECK (SMIME, init))
+    (CRYPT_MOD_CALL(PGP, init))();
     (CRYPT_MOD_CALL (SMIME, init)) ();
-#endif
 }
 
-
 /* Show a message that a backend will be invoked. */
 void crypt_invoke_message (int type)
 {
@@ -89,7 +51,6 @@ void crypt_invoke_message (int type)
     mutt_message _("Invoking S/MIME...");
   }
 }
-
 
 
 /*