From: Pietro Cerutti <gahr@gahr.ch>
Date: Sun, 5 Nov 2017 12:42:55 +0000 (+0000)
Subject: Move definition of conn/globals.h back into globals.h (#912)
X-Git-Tag: neomutt-20171208~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe03e2b126ca899f6fdd8276125bef3c66b6aef4;p=neomutt

Move definition of conn/globals.h back into globals.h (#912)

Fixed #907
---

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index 2f8ef5115..b8838e2f0 100644
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -40,6 +40,7 @@
 
 #include "config.h"
 
+#if 0
 short ConnectTimeout; /**< Config: $connect_timeout */
 
 #ifdef USE_SSL
@@ -57,3 +58,4 @@ short SslMinDhPrimeBits;           /**< Config: $ssl_min_dh_prime_bits */
 const char *Preconnect; /**< Config: $preconnect */
 const char *Tunnel;     /**< Config: $tunnel */
 #endif                  /* USE_SOCKET */
+#endif
diff --git a/globals.h b/globals.h
index 5fd8e97ba..d4a8355b0 100644
--- a/globals.h
+++ b/globals.h
@@ -326,6 +326,26 @@ WHERE int NmQueryWindowCurrentPosition;
 WHERE char *NmQueryWindowCurrentSearch;
 #endif
 
+#if 1
+WHERE short ConnectTimeout;
+
+#ifdef USE_SSL
+WHERE const char *CertificateFile;
+WHERE const char *EntropyFile;
+WHERE const char *SslCiphers;
+WHERE const char *SslClientCert;
+#ifdef USE_SSL_GNUTLS
+WHERE const char *SslCaCertificatesFile;
+WHERE short SslMinDhPrimeBits;
+#endif
+#endif
+
+#ifdef USE_SOCKET
+WHERE const char *Preconnect;
+WHERE const char *Tunnel;
+#endif
+#endif
+
 #ifdef MAIN_C
 const char *const BodyTypes[] = {
     "x-unknown", "audio",     "application", "image", "message",