Diffstat (limited to 'noncore/net/mail/libmailwrapper/smtpwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index afc5618..86673aa 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -312,7 +312,7 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
312 | return result; | 312 | return result; |
313 | } | 313 | } |
314 | 314 | ||
315 | void SMTPwrapper::sendMail(const Opie::osmart_pointer<Mail>&mail,bool later ) | 315 | void SMTPwrapper::sendMail(const Opie::OSmartPointer<Mail>&mail,bool later ) |
316 | { | 316 | { |
317 | mailmime * mimeMail; | 317 | mailmime * mimeMail; |
318 | 318 | ||
@@ -332,7 +332,7 @@ void SMTPwrapper::sendMail(const Opie::osmart_pointer<Mail>&mail,bool later ) | |||
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,RecMail*which) { | 335 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { |
336 | size_t curTok = 0; | 336 | size_t curTok = 0; |
337 | mailimf_fields *fields = 0; | 337 | mailimf_fields *fields = 0; |
338 | mailimf_field*ffrom = 0; | 338 | mailimf_field*ffrom = 0; |
@@ -340,7 +340,7 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,RecMail*which) { | |||
340 | char*from = 0; | 340 | char*from = 0; |
341 | int res = 0; | 341 | int res = 0; |
342 | 342 | ||
343 | encodedString * data = wrap->fetchRawBody(*which); | 343 | encodedString * data = wrap->fetchRawBody(which); |
344 | if (!data) | 344 | if (!data) |
345 | return 0; | 345 | return 0; |
346 | int err = mailimf_fields_parse( data->Content(), data->Length(), &curTok, &fields ); | 346 | int err = mailimf_fields_parse( data->Content(), data->Length(), &curTok, &fields ); |
@@ -391,8 +391,8 @@ bool SMTPwrapper::flushOutbox() { | |||
391 | return false; | 391 | return false; |
392 | } | 392 | } |
393 | QString oldPw, oldUser; | 393 | QString oldPw, oldUser; |
394 | QList<RecMail> mailsToSend; | 394 | QValueList<RecMailP> mailsToSend; |
395 | QList<RecMail> mailsToRemove; | 395 | QValueList<RecMailP> mailsToRemove; |
396 | QString mbox("Outgoing"); | 396 | QString mbox("Outgoing"); |
397 | wrap->listMessages(mbox,mailsToSend); | 397 | wrap->listMessages(mbox,mailsToSend); |
398 | if (mailsToSend.count()==0) { | 398 | if (mailsToSend.count()==0) { |
@@ -421,20 +421,19 @@ bool SMTPwrapper::flushOutbox() { | |||
421 | } | 421 | } |
422 | 422 | ||
423 | 423 | ||
424 | mailsToSend.setAutoDelete(false); | ||
425 | sendProgress = new progressMailSend(); | 424 | sendProgress = new progressMailSend(); |
426 | sendProgress->show(); | 425 | sendProgress->show(); |
427 | sendProgress->setMaxMails(mailsToSend.count()); | 426 | sendProgress->setMaxMails(mailsToSend.count()); |
428 | 427 | ||
429 | while (mailsToSend.count()>0) { | 428 | while (mailsToSend.count()>0) { |
430 | if (sendQueuedMail(wrap,mailsToSend.at(0))==0) { | 429 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { |
431 | QMessageBox::critical(0,tr("Error sending mail"), | 430 | QMessageBox::critical(0,tr("Error sending mail"), |
432 | tr("Error sending queued mail - breaking")); | 431 | tr("Error sending queued mail - breaking")); |
433 | returnValue = false; | 432 | returnValue = false; |
434 | break; | 433 | break; |
435 | } | 434 | } |
436 | mailsToRemove.append(mailsToSend.at(0)); | 435 | mailsToRemove.append((*mailsToSend.begin())); |
437 | mailsToSend.removeFirst(); | 436 | mailsToSend.remove(mailsToSend.begin()); |
438 | sendProgress->setCurrentMails(mailsToRemove.count()); | 437 | sendProgress->setCurrentMails(mailsToRemove.count()); |
439 | } | 438 | } |
440 | if (reset_user_value) { | 439 | if (reset_user_value) { |
@@ -450,7 +449,6 @@ bool SMTPwrapper::flushOutbox() { | |||
450 | delete sendProgress; | 449 | delete sendProgress; |
451 | sendProgress = 0; | 450 | sendProgress = 0; |
452 | wrap->deleteMails(mbox,mailsToRemove); | 451 | wrap->deleteMails(mbox,mailsToRemove); |
453 | mailsToSend.setAutoDelete(true); | ||
454 | delete wrap; | 452 | delete wrap; |
455 | return returnValue; | 453 | return returnValue; |
456 | } | 454 | } |