-rw-r--r-- | kmicromail/viewmail.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index f1e0225..2093678 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp | |||
@@ -100,3 +100,4 @@ void ViewMail::setBody(const RecBodyP&body ) | |||
100 | m_body = body; | 100 | m_body = body; |
101 | m_mail[2] = body->Bodytext(); | 101 | m_mail[2] = QString::fromUtf8( body->Bodytext().latin1() ); |
102 | // qDebug("********text %s ",m_mail[2].latin1() ); | ||
102 | attachbutton->setEnabled(body->Parts().count()>0); | 103 | attachbutton->setEnabled(body->Parts().count()>0); |
@@ -302,6 +303,6 @@ void ViewMail::setMail(const RecMailP&mail ) | |||
302 | 303 | ||
303 | m_mail[0] = mail->getFrom(); | 304 | m_mail[0] = QString::fromUtf8( mail->getFrom().latin1() ); |
304 | m_mail[1] = mail->getSubject(); | 305 | m_mail[1] = QString::fromUtf8( mail->getSubject().latin1() ); |
305 | m_mail[3] = mail->getDate(); | 306 | m_mail[3] = QString::fromUtf8( mail->getDate().latin1() ); |
306 | m_mail[4] = mail->Msgid(); | 307 | m_mail[4] = QString::fromUtf8( mail->Msgid().latin1() ); |
307 | 308 | ||
@@ -350,14 +351,7 @@ void ViewMail::setText() | |||
350 | 351 | ||
351 | for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) | 352 | |
352 | { | 353 | toString = QString::fromUtf8(m_mail2[0].join(",").latin1()); |
353 | toString += (*it); | 354 | ccString = QString::fromUtf8(m_mail2[1].join(",").latin1()); |
354 | } | 355 | bccString = QString::fromUtf8(m_mail2[2].join(",").latin1()); |
355 | for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) | 356 | |
356 | { | ||
357 | ccString += (*it); | ||
358 | } | ||
359 | for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) | ||
360 | { | ||
361 | bccString += (*it); | ||
362 | } | ||
363 | 357 | ||
@@ -458,5 +452,5 @@ void ViewMail::slotReply() | |||
458 | if (m_recMail->Replyto().isEmpty()) { | 452 | if (m_recMail->Replyto().isEmpty()) { |
459 | composer.setTo( m_recMail->getFrom()); | 453 | composer.setTo( QString::fromUtf8( m_recMail->getFrom().latin1())); |
460 | } else { | 454 | } else { |
461 | composer.setTo( m_recMail->Replyto()); | 455 | composer.setTo( QString::fromUtf8( m_recMail->Replyto().latin1())); |
462 | } | 456 | } |
@@ -470,4 +464,5 @@ void ViewMail::slotReply() | |||
470 | } | 464 | } |
465 | delete settings; | ||
471 | } | 466 | } |
472 | 467 | ||
473 | void ViewMail::slotForward() | 468 | void ViewMail::slotForward() |