mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
35 lines
686 B
Diff
35 lines
686 B
Diff
|
--- mutt-1.5.20/init.c.orig 2009-07-21 17:54:59 +0200
|
||
|
|
+++ mutt-1.5.20/init.c 2009-07-21 17:59:47 +0200
|
||
|
|
@@ -37,7 +37,6 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
|
||
|
|
-
|
||
|
|
#include "mx.h"
|
||
|
|
#include "init.h"
|
||
|
|
#include "mailbox.h"
|
||
|
|
@@ -50,6 +49,10 @@
|
||
|
|
#include <errno.h>
|
||
|
|
#include <sys/wait.h>
|
||
|
|
|
||
|
|
+#if defined(CRYPT_BACKEND_GPGME)
|
||
|
|
+#include <gpgme.h>
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#define CHECK_PAGER \
|
||
|
|
if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && \
|
||
|
|
(MuttVars[idx].flags & R_RESORT)) \
|
||
|
|
@@ -3262,6 +3265,11 @@
|
||
|
|
|
||
|
|
mutt_read_histfile ();
|
||
|
|
|
||
|
|
+#ifdef CRYPT_BACKEND_GPGME
|
||
|
|
+ /* needed since version 1.2.0, ticket #3300 */
|
||
|
|
+ gpgme_check_version (NULL);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#if 0
|
||
|
|
set_option (OPTWEED); /* turn weeding on by default */
|
||
|
|
#endif
|
||
|
|
|