summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-10 21:14:19 (UTC)
committer zautrix <zautrix>2005-03-10 21:14:19 (UTC)
commit6e3c3178fa8e0c421753c08506b4a91bbcecc26f (patch) (unidiff)
treeff9c2b22376e71e135f59154c6aeeb8ed95f10ce
parent3a1891136e7b1290a6b3ddd573a863e51bd3047b (diff)
downloadkdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.zip
kdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.tar.gz
kdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.tar.bz2
smtp ompi fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--kmicromail/editaccounts.cpp24
-rw-r--r--kmicromail/libetpan/tools/mailstream_socket.c2
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp8
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
@@ -23,2 +23,7 @@ Rearranged KO/Pi file menu structure.
23 23
24OM/Pi:
25Added to the SMTP account setting the option
26"No secure connection".
27You have to configure your SMTP accounts again, sorry.
28
24 29
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,
332 332
333 fillValues(); 333 //fillValues();
334 334
@@ -340,3 +340,4 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
340 CommandEdit->hide(); 340 CommandEdit->hide();
341 ComboBox1->setCurrentItem( data->ConnectionType() ); 341 fillValues();
342 // ComboBox1->setCurrentItem( data->ConnectionType() );
342} 343}
@@ -411,3 +412,3 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
411 data = account; 412 data = account;
412 fillValues(); 413 //fillValues();
413 414
@@ -419,3 +420,4 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
419 CommandEdit->hide(); 420 CommandEdit->hide();
420 ComboBox1->setCurrentItem( data->ConnectionType() ); 421 fillValues();
422 //ComboBox1->setCurrentItem( data->ConnectionType() );
421} 423}
@@ -493,3 +495,3 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
493 495
494 fillValues(); 496 // fillValues();
495 QIconSet icon; 497 QIconSet icon;
@@ -502,8 +504,10 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
502 connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); 504 connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
503 ComboBox1->insertItem( "Only if available", 0 ); 505 ComboBox1->insertItem( "No secure connection, no TLS", 0 );
504 ComboBox1->insertItem( "Always, Negotiated", 1 ); 506 ComboBox1->insertItem( "Only if available, try TLS", 1 );
505 ComboBox1->insertItem( "Connect on secure port", 2 ); 507 ComboBox1->insertItem( "Always, use TLS", 2 );
506 ComboBox1->insertItem( "Run command instead", 3 ); 508 ComboBox1->insertItem( "Connect on secure port (SSL)", 3 );
509 ComboBox1->insertItem( "Run command instead", 4 );
507 CommandEdit->hide(); 510 CommandEdit->hide();
508 ComboBox1->setCurrentItem( data->ConnectionType() ); 511 fillValues();
512 //ComboBox1->setCurrentItem( data->ConnectionType() );
509} 513}
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,
208 timeout.tv_sec = DEFAULT_NETWORK_TIMEOUT; 208 timeout.tv_sec = DEFAULT_NETWORK_TIMEOUT;
209 fprintf(stderr,"fd %d to secs %d \n", socket_data->fd, timeout.tv_sec ); 209 //fprintf(stderr,"fd %d to secs %d \n", socket_data->fd, timeout.tv_sec );
210 r = select(socket_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout); 210 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()
195 ssl = false; 195 ssl = false;
196 bool try_tls = true; 196 bool try_tls = false;
197 bool force_tls=false; 197 bool force_tls=false;
@@ -203,7 +203,9 @@ void SMTPwrapper::connect_server()
203 server = m_SmtpAccount->getServer(); 203 server = m_SmtpAccount->getServer();
204 if ( m_SmtpAccount->ConnectionType() == 2 ) { 204 if ( m_SmtpAccount->ConnectionType() == 3 ) {
205 ssl = true; 205 ssl = true;
206 try_tls = false; 206 try_tls = false;
207 } else if (m_SmtpAccount->ConnectionType() == 1) { 207 } else if (m_SmtpAccount->ConnectionType() == 2) {
208 force_tls = true; 208 force_tls = true;
209 } else if (m_SmtpAccount->ConnectionType() == 1) {
210 try_tls = true;
209 } 211 }