projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
18f3079
..
4a1fe59
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-23,10
+23,10
@@
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
-#include <lib-crypt/crypt.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include <lib-mx/mx.h>
#include "mutt.h"
+#include "crypt.h"
#include "alias.h"
#include "buffy.h"
#include "sort.h"
#include "alias.h"
#include "buffy.h"
#include "sort.h"
@@
-66,9
+66,7
@@
extern int optind;
#include <gnutls/gnutls.h>
#endif
#include <gnutls/gnutls.h>
#endif
-#ifdef CRYPT_BACKEND_GPGME
#include <gpgme.h>
#include <gpgme.h>
-#endif
#ifdef USE_SSL
#include <openssl/opensslv.h>
#ifdef USE_SSL
#include <openssl/opensslv.h>
@@
-199,10
+197,7
@@
static void show_version (void)
printf (" %s\n",OPENSSL_VERSION_TEXT);
#endif
printf (" %s\n",OPENSSL_VERSION_TEXT);
#endif
-#ifdef CRYPT_BACKEND_GPGME
printf (" gpgme %s\n", GPGME_VERSION);
printf (" gpgme %s\n", GPGME_VERSION);
-#endif
-
puts (_("Compile Options:"));
puts (
puts (_("Compile Options:"));
puts (
@@
-304,11
+299,7
@@
static void show_version (void)
);
puts (
);
puts (
-#ifdef CRYPT_BACKEND_GPGME
"+CRYPT_BACKEND_GPGME "
"+CRYPT_BACKEND_GPGME "
-#else
- "-CRYPT_BACKEND_GPGME "
-#endif
"\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
"\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
@@
-589,9
+580,6
@@
int main (int argc, char **argv)
mutt_init (flags & M_NOSYSRC, commands);
string_list_wipe(&commands);
mutt_init (flags & M_NOSYSRC, commands);
string_list_wipe(&commands);
- /* Initialize crypto */
- crypt_init ();
-
if (queries)
return mutt_query_variables (queries);
if (dump_variables > 0)
if (queries)
return mutt_query_variables (queries);
if (dump_variables > 0)