author | llornkcor <llornkcor> | 2003-06-09 01:37:23 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-06-09 01:37:23 (UTC) |
commit | 364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560 (patch) (unidiff) | |
tree | 1be5d3150c2bda4b3a55f9e7d2529d73fe6d72db /noncore/unsupported/mailit/emailclient.cpp | |
parent | 5ee1c7dff5679454d46e3c5bd5747c60ea63c959 (diff) | |
download | opie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.zip opie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.tar.gz opie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.tar.bz2 |
patch from wim delvaux. fix from me
Diffstat (limited to 'noncore/unsupported/mailit/emailclient.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 71 |
1 files changed, 38 insertions, 33 deletions
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index da1226c..749a4e9 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp | |||
@@ -60,8 +60,8 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) | |||
60 | connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); | 60 | connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); |
61 | 61 | ||
62 | connect(emailHandler, SIGNAL(smtpError(int)), this, | 62 | connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this, |
63 | SLOT(smtpError(int)) ); | 63 | SLOT(smtpError(int,const QString &)) ); |
64 | connect(emailHandler, SIGNAL(popError(int)), this, | 64 | connect(emailHandler, SIGNAL(popError(int,const QString &)), this, |
65 | SLOT(popError(int)) ); | 65 | SLOT(popError(int,const QString &)) ); |
66 | 66 | ||
67 | connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) ); | 67 | connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) ); |
@@ -481,5 +481,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) | |||
481 | } | 481 | } |
482 | 482 | ||
483 | void EmailClient::allMailArrived(int count) | 483 | void EmailClient::allMailArrived(int /*count*/) |
484 | { | 484 | { |
485 | // not previewing means all mailtransfer has been done | 485 | // not previewing means all mailtransfer has been done |
@@ -519,17 +519,19 @@ void EmailClient::moveMailFront(Email *mailPtr) | |||
519 | } | 519 | } |
520 | 520 | ||
521 | void EmailClient::smtpError(int code) | 521 | void EmailClient::smtpError(int code, const QString & Msg) |
522 | { | 522 | { |
523 | QString temp; | 523 | QString temp; |
524 | 524 | ||
525 | if (code == ErrUnknownResponse) | 525 | if (code == ErrUnknownResponse) { |
526 | temp = "Unknown response from server"; | 526 | temp = tr("<qt>Unknown response from server</qt>"); |
527 | 527 | if( ! Msg.isEmpty() ) | |
528 | if (code == QSocket::ErrHostNotFound) | 528 | temp += Msg; |
529 | temp = "host not found"; | 529 | } else if (code == QSocket::ErrHostNotFound) { |
530 | if (code == QSocket::ErrConnectionRefused) | 530 | temp = tr("<qt>host not found</qt>"); |
531 | temp = "connection refused"; | 531 | } else if (code == QSocket::ErrConnectionRefused) { |
532 | if (code == QSocket::ErrSocketRead) | 532 | temp = tr("<qt>connection refused</qt>"); |
533 | temp = "socket packet error"; | 533 | } else if (code == QSocket::ErrSocketRead) { |
534 | temp = tr("<qt>socket packet error</qt>"); | ||
535 | } | ||
534 | 536 | ||
535 | if (code != ErrCancel) { | 537 | if (code != ErrCancel) { |
@@ -545,22 +547,25 @@ void EmailClient::smtpError(int code) | |||
545 | } | 547 | } |
546 | 548 | ||
547 | void EmailClient::popError(int code) | 549 | void EmailClient::popError(int code, const QString & Msg) |
548 | { | 550 | { |
549 | QString temp; | 551 | QString temp; |
550 | 552 | ||
551 | if (code == ErrUnknownResponse) | 553 | if (code == ErrUnknownResponse) { |
552 | temp = "Unknown response from server"; | 554 | temp = tr("<qt>Unknown response from server</qt>"); |
553 | if (code == ErrLoginFailed) | 555 | if( ! Msg.isEmpty() ) |
554 | temp = "Login failed\nCheck user name and password"; | 556 | temp += Msg; |
555 | 557 | } else if (code == ErrLoginFailed) { | |
556 | if (code == QSocket::ErrHostNotFound) | 558 | temp = tr("<qt>Login failed\nCheck user name and password</qt>"); |
557 | temp = "host not found"; | 559 | } else if (code == QSocket::ErrHostNotFound) { |
558 | if (code == QSocket::ErrConnectionRefused) | 560 | temp = tr("<qt>host not found</qt>"); |
559 | temp = "connection refused"; | 561 | } else if (code == QSocket::ErrConnectionRefused) { |
560 | if (code == QSocket::ErrSocketRead) | 562 | temp = tr("<qt>connection refused</qt>"); |
561 | temp = "socket packet error"; | 563 | } else if (code == QSocket::ErrSocketRead) { |
564 | temp = tr("<qt>socket packet error</qt>"); | ||
565 | } | ||
562 | 566 | ||
563 | if (code != ErrCancel) { | 567 | if (code != ErrCancel) { |
564 | QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n"); | 568 | QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n")); |
569 | |||
565 | } else { | 570 | } else { |
566 | status2Label->setText("Aborted by user"); | 571 | status2Label->setText("Aborted by user"); |
@@ -899,5 +904,5 @@ void EmailClient::setMailSize(int size) | |||
899 | } | 904 | } |
900 | 905 | ||
901 | void EmailClient::setTotalSize(int size) | 906 | void EmailClient::setTotalSize(int /*size*/) |
902 | { | 907 | { |
903 | 908 | ||
@@ -921,5 +926,5 @@ void EmailClient::deleteItem() | |||
921 | 926 | ||
922 | EmailListItem* eli; | 927 | EmailListItem* eli; |
923 | int pos; | 928 | // int pos; |
924 | 929 | ||
925 | inbox ? box=inboxView : box=outboxView; | 930 | inbox ? box=inboxView : box=outboxView; |
@@ -947,5 +952,5 @@ void EmailClient::inboxItemReleased() | |||
947 | /*void EmailClient::timerEvent(QTimerEvent *e) | 952 | /*void EmailClient::timerEvent(QTimerEvent *e) |
948 | { | 953 | { |
949 | /*killTimer(timerID); | 954 | //killTimer(timerID); |
950 | 955 | ||
951 | 956 | ||
@@ -992,9 +997,9 @@ void EmailClient::download(Email* mail) | |||
992 | } | 997 | } |
993 | 998 | ||
994 | void EmailClient::receive(const QCString& msg, const QByteArray& data) | 999 | void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/) |
995 | { | 1000 | { |
996 | /*if (msg=="getMail()") | 1001 | /*if (msg=="getMail()") |
997 | { | 1002 | { |
998 | /*QDialog qd(qApp->activeWindow(),"Getting mail",true); | 1003 | //QDialog qd(qApp->activeWindow(),"Getting mail",true); |
999 | QVBoxLayout *vbProg = new QVBoxLayout( &qd ); | 1004 | QVBoxLayout *vbProg = new QVBoxLayout( &qd ); |
1000 | 1005 | ||