-rw-r--r-- | noncore/net/mail/libmailwrapper/genericwrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index 3e4293b..1caa375 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -427,51 +427,50 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & | |||
427 | } | 427 | } |
428 | mailimf_single_fields single_fields; | 428 | mailimf_single_fields single_fields; |
429 | mailimf_single_fields_init(&single_fields, msg->msg_fields); | 429 | mailimf_single_fields_init(&single_fields, msg->msg_fields); |
430 | mail->setMsgsize(msg->msg_size); | 430 | mail->setMsgsize(msg->msg_size); |
431 | mail->setFlags(mFlags); | 431 | mail->setFlags(mFlags); |
432 | mail->setMbox(mailbox); | 432 | mail->setMbox(mailbox); |
433 | mail->setNumber(msg->msg_index); | 433 | mail->setNumber(msg->msg_index); |
434 | if (single_fields.fld_subject) | 434 | if (single_fields.fld_subject) |
435 | mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); | 435 | mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); |
436 | if (single_fields.fld_from) | 436 | if (single_fields.fld_from) |
437 | mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); | 437 | mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); |
438 | if (!mbox_as_to) { | 438 | if (!mbox_as_to) { |
439 | if (single_fields.fld_to) | 439 | if (single_fields.fld_to) |
440 | mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); | 440 | mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); |
441 | } else { | 441 | } else { |
442 | mail->setTo(mailbox); | 442 | mail->setTo(mailbox); |
443 | } | 443 | } |
444 | if (single_fields.fld_cc) | 444 | if (single_fields.fld_cc) |
445 | mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); | 445 | mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); |
446 | if (single_fields.fld_bcc) | 446 | if (single_fields.fld_bcc) |
447 | mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); | 447 | mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); |
448 | if (single_fields.fld_orig_date) | 448 | if (single_fields.fld_orig_date) |
449 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); | 449 | mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); |
450 | // crashes when accessing pop3 account? | 450 | // crashes when accessing pop3 account? |
451 | if (single_fields.fld_message_id->mid_value) { | 451 | if (single_fields.fld_message_id && single_fields.fld_message_id->mid_value) { |
452 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); | 452 | mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); |
453 | odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; | ||
454 | } | 453 | } |
455 | 454 | ||
456 | if (single_fields.fld_reply_to) { | 455 | if (single_fields.fld_reply_to) { |
457 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); | 456 | QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); |
458 | if (t.count()>0) { | 457 | if (t.count()>0) { |
459 | mail->setReplyto(t[0]); | 458 | mail->setReplyto(t[0]); |
460 | } | 459 | } |
461 | } | 460 | } |
462 | #if 0 | 461 | #if 0 |
463 | refs = single_fields.fld_references; | 462 | refs = single_fields.fld_references; |
464 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | 463 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { |
465 | char * text = (char*)refs->mid_list->first->data; | 464 | char * text = (char*)refs->mid_list->first->data; |
466 | mail->setReplyto(QString(text)); | 465 | mail->setReplyto(QString(text)); |
467 | } | 466 | } |
468 | #endif | 467 | #endif |
469 | if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list && | 468 | if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list && |
470 | clist_count(single_fields.fld_in_reply_to->mid_list)) { | 469 | clist_count(single_fields.fld_in_reply_to->mid_list)) { |
471 | mail->setInreply(parseInreplies(single_fields.fld_in_reply_to)); | 470 | mail->setInreply(parseInreplies(single_fields.fld_in_reply_to)); |
472 | } | 471 | } |
473 | target.append(mail); | 472 | target.append(mail); |
474 | } | 473 | } |
475 | if (env_list) { | 474 | if (env_list) { |
476 | mailmessage_list_free(env_list); | 475 | mailmessage_list_free(env_list); |
477 | } | 476 | } |