smtp ompi fix

1 files changed, 14 insertions, 10 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() );
 }