| -rw-r--r-- | kmicromail/accountview.cpp | 18 | ||||
| -rw-r--r-- | kmicromail/accountview.h | 1 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 26 | ||||
| -rw-r--r-- | kmicromail/opiemail.cpp | 2 |
4 files changed, 35 insertions, 12 deletions
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp index c9c4a0f..3ad3e9b 100644 --- a/kmicromail/accountview.cpp +++ b/kmicromail/accountview.cpp @@ -99,4 +99,22 @@ void AccountView::refresh(QListViewItem *item) } } +void AccountView::refreshOutgoing() +{ + m_currentItem = currentItem(); + if ( !m_currentItem ) return; + AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem); + QString bName = view->getFolder()->getDisplayName(); + if (bName.startsWith("/")&&bName.length()>1) + { + bName.replace(0,1,""); + } + int pos = bName.findRev("/"); + if (pos > 0) + { + bName.replace(0,pos+1,""); + } + if ( bName.lower() == "outgoing" ) + refreshCurrent(); +} void AccountView::refreshCurrent() diff --git a/kmicromail/accountview.h b/kmicromail/accountview.h index 79ed2e7..e403cb8 100644 --- a/kmicromail/accountview.h +++ b/kmicromail/accountview.h @@ -31,4 +31,5 @@ public slots: virtual void refresh(QListViewItem *item); virtual void refreshCurrent(); + virtual void refreshOutgoing(); virtual void slotHold(int, QListViewItem *,const QPoint&,int); virtual void slotContextMenu(int id); diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index f54fe2b..24f4786 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp @@ -160,5 +160,5 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char* if (failuremessage) { QMessageBox::critical(0,i18n("Error sending mail"), - i18n("<center>%1</center>").arg(failuremessage)); + failuremessage); } } @@ -220,5 +220,5 @@ void SMTPwrapper::connect_server() ; // odebug << "Servername " << server << " at port " << port << "" << oendl; if ( ssl ) { - ; // odebug << "SSL session" << oendl; + qDebug("smtp: ssl_connect "); err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port ); } else { @@ -227,9 +227,10 @@ void SMTPwrapper::connect_server() } if ( err != MAILSMTP_NO_ERROR ) { - ; // odebug << "Error init connection" << oendl; - failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); + qDebug("Error init SMTP connection" ); + failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); result = 0; } + qDebug("SMTP connection inited "); /* switch to tls after init 'cause there it will send the ehlo */ if (result) { @@ -237,20 +238,22 @@ void SMTPwrapper::connect_server() if (err != MAILSMTP_NO_ERROR) { result = 0; - failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); + qDebug("Error init SMTP connection "); + failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); } } - if (try_tls) { + qDebug("Smpt: Try tls "); err = start_smtp_tls(); if (err != MAILSMTP_NO_ERROR) { try_tls = false; + qDebug("no tls "); } else { err = mailesmtp_ehlo(m_smtp); } } - + //qDebug("mailesmtp_ehlo %d ",err ); if (!try_tls && force_tls) { result = 0; - failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err)); + failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); } @@ -268,5 +271,5 @@ void SMTPwrapper::connect_server() } else { result = 0; - failuretext=i18n("Login aborted - storing mail to localfolder"); + failuretext=i18n("Login aborted - \nstoring mail to localfolder"); } } else { @@ -278,5 +281,5 @@ void SMTPwrapper::connect_server() err = mailsmtp_auth( m_smtp, (char*)user.latin1(), (char*)pass.latin1() ); if ( err == MAILSMTP_NO_ERROR ) { - ; // odebug << "auth ok" << oendl; + qDebug("Smtp authentification ok "); } else { failuretext = i18n("Authentification failed"); @@ -307,5 +310,6 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) err = mailsmtp_send( m_smtp, from, rcpts, data, size ); if ( err != MAILSMTP_NO_ERROR ) { - failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err)); + qDebug("Error sending mail"); + failuretext=i18n("Error sending mail:\n%1").arg(mailsmtpError(err)); result = 0; } diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index e159b73..f68467c 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -237,5 +237,5 @@ void OpieMail::slotSendQueued() delete wrap; } - // pending refresh list view, if outgoing is displayed + folderView->refreshOutgoing(); } |