From de9d03d9520f18cb91d99900f5906430a06ad5e7 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Thu, 9 Feb 2006 21:03:16 +0000
Subject: [PATCH] Fixed dangling 'else'-block when TLS is not enabled (thanks
 to Tim Teulings).

---
 src/net/imap/IMAPConnection.cpp | 2 +-
 src/net/pop3/POP3Store.cpp      | 2 +-
 src/net/smtp/SMTPTransport.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp
index bbf39a84..bd963f56 100644
--- a/src/net/imap/IMAPConnection.cpp
+++ b/src/net/imap/IMAPConnection.cpp
@@ -109,8 +109,8 @@ void IMAPConnection::connect()
 		m_secured = true;
 		m_cntInfos = vmime::create <tls::TLSSecuredConnectionInfos>(address, port, tlsSession, tlsSocket);
 	}
-#endif // VMIME_HAVE_TLS_SUPPORT
 	else
+#endif // VMIME_HAVE_TLS_SUPPORT
 	{
 		m_cntInfos = vmime::create <defaultConnectionInfos>(address, port);
 	}
diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp
index 7966ee3f..67f478cb 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/net/pop3/POP3Store.cpp
@@ -147,8 +147,8 @@ void POP3Store::connect()
 		m_secured = true;
 		m_cntInfos = vmime::create <tls::TLSSecuredConnectionInfos>(address, port, tlsSession, tlsSocket);
 	}
-#endif // VMIME_HAVE_TLS_SUPPORT
 	else
+#endif // VMIME_HAVE_TLS_SUPPORT
 	{
 		m_cntInfos = vmime::create <defaultConnectionInfos>(address, port);
 	}
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 9f059271..e97bbb6f 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -113,8 +113,8 @@ void SMTPTransport::connect()
 		m_secured = true;
 		m_cntInfos = vmime::create <tls::TLSSecuredConnectionInfos>(address, port, tlsSession, tlsSocket);
 	}
-#endif // VMIME_HAVE_TLS_SUPPORT
 	else
+#endif // VMIME_HAVE_TLS_SUPPORT
 	{
 		m_cntInfos = vmime::create <defaultConnectionInfos>(address, port);
 	}