4 files changed, 25 insertions, 14 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 5661955..65f9168 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -22,4 +22,9 @@ Cancel key now closes date picker.
 Rearranged KO/Pi file menu structure.
 
+OM/Pi:
+Added to the SMTP account setting the option
+"No secure connection".
+You have to configure your SMTP accounts again, sorry.
+
 
 ********** VERSION 2.0.14 ************
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index f1075c0..49049f6 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -331,5 +331,5 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
     data = account;
 
-    fillValues();
+    //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
@@ -339,5 +339,6 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    // ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
@@ -410,5 +411,5 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
 {
     data = account;
-    fillValues();
+    //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
@@ -418,5 +419,6 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
@@ -492,5 +494,5 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
 
-    fillValues();
+    // fillValues();
     QIconSet icon;
     //icon = SmallIcon("fileexport");
@@ -501,10 +503,12 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
     connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) );
     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() );
 }
 void SMTPconfig::chooseSig()
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
@@ -207,5 +207,5 @@ static ssize_t mailstream_low_socket_write(mailstream_low * s,
     if (  timeout.tv_sec > DEFAULT_NETWORK_TIMEOUT ) 
         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);
     if (r < 1)
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
@@ -194,5 +194,5 @@ void SMTPwrapper::connect_server()
     uint16_t port;
     ssl = false;
-    bool try_tls = true;
+    bool try_tls = false;
     bool force_tls=false;
     QString failuretext = "";
@@ -202,9 +202,11 @@ 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;
     }
     int result = 1;