projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build POP support, we do a /mail/ client, right ?
[apps/madmutt.git]
/
cryptglue.c
diff --git
a/cryptglue.c
b/cryptglue.c
index
d83b612
..
d76fa44
100644
(file)
--- a/
cryptglue.c
+++ b/
cryptglue.c
@@
-37,13
+37,8
@@
*/
*/
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
extern struct crypt_module_specs crypt_mod_pgp_classic;
extern struct crypt_module_specs crypt_mod_pgp_classic;
-#endif
-
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
extern struct crypt_module_specs crypt_mod_smime_classic;
extern struct crypt_module_specs crypt_mod_smime_classic;
-#endif
#ifdef CRYPT_BACKEND_GPGME
extern struct crypt_module_specs crypt_mod_pgp_gpgme;
#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)
{
void crypt_init (void)
{
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
if (
#ifdef CRYPT_BACKEND_GPGME
(!option (OPTCRYPTUSEGPGME))
if (
#ifdef CRYPT_BACKEND_GPGME
(!option (OPTCRYPTUSEGPGME))
@@
-61,9
+55,7
@@
void crypt_init (void)
#endif
)
crypto_module_register (&crypt_mod_pgp_classic);
#endif
)
crypto_module_register (&crypt_mod_pgp_classic);
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
if (
#ifdef CRYPT_BACKEND_GPGME
(!option (OPTCRYPTUSEGPGME))
if (
#ifdef CRYPT_BACKEND_GPGME
(!option (OPTCRYPTUSEGPGME))
@@
-72,7
+64,6
@@
void crypt_init (void)
#endif
)
crypto_module_register (&crypt_mod_smime_classic);
#endif
)
crypto_module_register (&crypt_mod_smime_classic);
-#endif
if (option (OPTCRYPTUSEGPGME)) {
#ifdef CRYPT_BACKEND_GPGME
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)
{
/* 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...");
}
mutt_message _("Invoking PGP...");
}
- else if (
(WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)
) {
+ else if (
type & APPLICATION_SMIME
) {
mutt_message _("Invoking S/MIME...");
}
}
mutt_message _("Invoking S/MIME...");
}
}