3 files changed, 20 insertions, 14 deletions

diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index f1075c0..49049f6 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -332,3 +332,3 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
 
-    fillValues();
+    //fillValues();
 
@@ -340,3 +340,4 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    // ComboBox1->setCurrentItem( data->ConnectionType() );
 }
@@ -411,3 +412,3 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
     data = account;
-    fillValues();
+    //fillValues();
 
@@ -419,3 +420,4 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
@@ -493,3 +495,3 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
 
-    fillValues();
+    // fillValues();
     QIconSet icon;
@@ -502,8 +504,10 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
-    ComboBox1->insertItem( "Only if available", 0 );
-    ComboBox1->insertItem( "Always, Negotiated", 1 );
-    ComboBox1->insertItem( "Connect on secure port", 2 );
-    ComboBox1->insertItem( "Run command instead", 3 );
+    ComboBox1->insertItem( "No secure connection, no TLS", 0 );
+    ComboBox1->insertItem( "Only if available, try TLS", 1 );
+    ComboBox1->insertItem( "Always, use TLS", 2 );
+    ComboBox1->insertItem( "Connect on secure port (SSL)", 3 );
+    ComboBox1->insertItem( "Run command instead", 4 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
diff --git a/kmicromail/libetpan/tools/mailstream_socket.c b/kmicromail/libetpan/tools/mailstream_socket.c
index 04a6f48..fd2c758 100644
--- a/kmicromail/libetpan/tools/mailstream_socket.c
+++ b/kmicromail/libetpan/tools/mailstream_socket.c
@@ -208,3 +208,3 @@ static ssize_t mailstream_low_socket_write(mailstream_low * s,
         timeout.tv_sec = DEFAULT_NETWORK_TIMEOUT; 
-    fprintf(stderr,"fd %d to secs %d  \n", socket_data->fd, timeout.tv_sec );
+    //fprintf(stderr,"fd %d to secs %d  \n", socket_data->fd, timeout.tv_sec );
     r = select(socket_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout);
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 5096f67..872a460 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -195,3 +195,3 @@ void SMTPwrapper::connect_server()
     ssl = false;
-    bool try_tls = true;
+    bool try_tls = false;
     bool force_tls=false;
@@ -203,7 +203,9 @@ void SMTPwrapper::connect_server()
     server = m_SmtpAccount->getServer();
-    if  ( m_SmtpAccount->ConnectionType() == 2 ) {
+    if  ( m_SmtpAccount->ConnectionType() == 3 ) {
         ssl = true;
         try_tls = false;
-    } else if (m_SmtpAccount->ConnectionType() == 1) {
+    } else if (m_SmtpAccount->ConnectionType() == 2) {
         force_tls = true;
+    } else if (m_SmtpAccount->ConnectionType() == 1) {
+        try_tls = true;
     }