| -rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 1ed9f34..0b6adf7 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp @@ -351,29 +351,29 @@ QString Genericwrapper::parseGroup( mailimf_group *group ) } result.append( ";" ); return result; } QString Genericwrapper::parseMailbox( mailimf_mailbox *box ) { QString result( "" ); if ( box->mb_display_name == NULL ) { - result.append( box->mb_addr_spec ); + result.append( convert_String(box->mb_addr_spec) ); } else { result.append( convert_String(box->mb_display_name) ); result.append( " <" ); - result.append( box->mb_addr_spec ); + result.append( convert_String( box->mb_addr_spec) ); result.append( ">" ); } return result; } QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list ) { QString result( "" ); bool first = true; for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { @@ -481,26 +481,27 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > & r = mailmessage_get_flags(msg,&flag_result); if (r == MAIL_ERROR_NOT_IMPLEMENTED) { mFlags.setBit(FLAG_SEEN); } mailimf_single_fields single_fields; mailimf_single_fields_init(&single_fields, msg->msg_fields); mail->setMsgsize(msg->msg_size); mail->setFlags(mFlags); mail->setMbox(mailbox); mail->setNumber(msg->msg_index); if (single_fields.fld_subject) mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); - if (single_fields.fld_from) + if (single_fields.fld_from) { mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); + } if (!mbox_as_to) { if (single_fields.fld_to) mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); } else { mail->setTo(mailbox); } if (single_fields.fld_cc) mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); if (single_fields.fld_bcc) mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); if (single_fields.fld_orig_date) { QDateTime dt = Genericwrapper::parseDateTime( single_fields.fld_orig_date->dt_date_time ); |