upstream/544794-smtp-batch.patch: mutt won't ask for a password if smtp_user and...

[software/mutt-debian.git] / globals.h

diff --git a/globals.h b/globals.h
index 2588270580bfb851fbb5ef2838c522c7b7e49bb5..94aa457c5333bdffdc47ac2856e05ca2c55a1981 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -113,6 +113,7 @@ WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *QueryFormat;
 WHERE char *Realname;
 WHERE char *QueryCmd;
 WHERE char *QueryFormat;
 WHERE char *Realname;

+WHERE short SearchContext;

 WHERE char *SendCharset;
 WHERE char *Sendmail;
 WHERE char *Shell;
 WHERE char *SendCharset;
 WHERE char *Sendmail;
 WHERE char *Shell;


@@ -127,18 +128,13 @@ WHERE char *Spoolfile;
 WHERE char *SpamSep;
 #if defined(USE_SSL)
 WHERE char *SslCertFile INITVAL (NULL);
 WHERE char *SpamSep;
 #if defined(USE_SSL)
 WHERE char *SslCertFile INITVAL (NULL);

-#endif
-#ifdef USE_SSL_OPENSSL

 WHERE char *SslClientCert INITVAL (NULL);
 WHERE char *SslClientCert INITVAL (NULL);

-WHERE LIST *SslSessionCerts INITVAL (NULL);
-#endif
-#if defined(USE_SSL)

 WHERE char *SslEntropyFile INITVAL (NULL);
 WHERE char *SslEntropyFile INITVAL (NULL);

-#endif

 #ifdef USE_SSL_GNUTLS
 WHERE short SslDHPrimeBits;
 WHERE char *SslCACertFile INITVAL (NULL);
 #endif
 #ifdef USE_SSL_GNUTLS
 WHERE short SslDHPrimeBits;
 WHERE char *SslCACertFile INITVAL (NULL);
 #endif

+#endif

 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tempdir;
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tempdir;


@@ -153,6 +149,7 @@ WHERE char *LastFolder;
 WHERE const char *ReleaseDate;
 
 WHERE HASH *Groups;
 WHERE const char *ReleaseDate;
 
 WHERE HASH *Groups;

+WHERE HASH *ReverseAlias;

 
 WHERE LIST *AutoViewList INITVAL(0);
 WHERE LIST *AlternativeOrderList INITVAL(0);
 
 WHERE LIST *AutoViewList INITVAL(0);
 WHERE LIST *AlternativeOrderList INITVAL(0);


@@ -211,6 +208,7 @@ WHERE short ScoreThresholdFlag;
 
 #ifdef USE_IMAP
 WHERE short ImapKeepalive;
 
 #ifdef USE_IMAP
 WHERE short ImapKeepalive;

+WHERE short ImapPipelineDepth;

 #endif
 
 /* flags for received signals */
 #endif
 
 /* flags for received signals */