1 files changed, 10 insertions, 10 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 2093678..4883231 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -93,17 +93,17 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
    }
    return item;
 }
 void ViewMail::setBody(const RecBodyP&body )
 {
    m_body = body;
-    m_mail[2] = QString::fromUtf8( body->Bodytext().latin1() );
+    m_mail[2] = body->Bodytext();
    // qDebug("********text %s ",m_mail[2].latin1() );
    attachbutton->setEnabled(body->Parts().count()>0);
    attachments->setEnabled(body->Parts().count()>0);
    if (body->Parts().count()==0)
    {
        return;
    }
    AttachItem * curItem=0;
@@ -296,20 +296,20 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 }
 void ViewMail::setMail(const RecMailP&mail )
 {
    m_recMail = mail;
-    m_mail[0] = QString::fromUtf8( mail->getFrom().latin1() );
+    m_mail[0] = mail->getFrom();
-    m_mail[1] = QString::fromUtf8( mail->getSubject().latin1() );
+    m_mail[1] = mail->getSubject();
-    m_mail[3] = QString::fromUtf8( mail->getDate().latin1() );
+    m_mail[3] = mail->getDate();
-    m_mail[4] = QString::fromUtf8( mail->Msgid().latin1() );
+    m_mail[4] = mail->Msgid();
    m_mail2[0] = mail->To();
    m_mail2[1] = mail->CC();
    m_mail2[2] = mail->Bcc();
    setText();
 }
@@ -345,19 +345,19 @@ void ViewMail::readConfig()
 void ViewMail::setText()
 {
    QString toString;
    QString ccString;
    QString bccString;
   
-    toString = QString::fromUtf8(m_mail2[0].join(",").latin1());
+    toString = m_mail2[0].join(",");
-    ccString  =  QString::fromUtf8(m_mail2[1].join(",").latin1());
+    ccString  = m_mail2[1].join(",");
-    bccString = QString::fromUtf8(m_mail2[2].join(",").latin1());
+    bccString = m_mail2[2].join(",");
  
    setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
    m_mailHtml = "<html><body>"
                 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
@@ -445,19 +445,19 @@ void ViewMail::slotReply()
    QString prefix;
    if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
    else prefix = "Re: ";                // no i18n on purpose
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    if (m_recMail->Replyto().isEmpty()) {
-        composer.setTo(  QString::fromUtf8( m_recMail->getFrom().latin1()));
+        composer.setTo(m_recMail->getFrom());
    } else {
-        composer.setTo(  QString::fromUtf8( m_recMail->Replyto().latin1()));
+        composer.setTo(m_recMail->Replyto());
    }
    composer.setSubject( prefix + m_mail[1] );
    composer.setMessage( rtext );
    composer.setInReplyTo(m_recMail->Msgid());
    if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
    {
        m_recMail->Wrapper()->answeredMail(m_recMail);

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 2093678..4883231 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp
@@ -93,17 +93,17 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
93	}	93	}
94	return item;	94	return item;
95	}	95	}
96		96
97	void ViewMail::setBody(const RecBodyP&body )	97	void ViewMail::setBody(const RecBodyP&body )
98	{	98	{
99		99
100	m_body = body;	100	m_body = body;
101	m_mail[2] = QString::fromUtf8( body->Bodytext().latin1() );	101	m_mail[2] = body->Bodytext();
102	// qDebug("********text %s ",m_mail[2].latin1() );	102	// qDebug("********text %s ",m_mail[2].latin1() );
103	attachbutton->setEnabled(body->Parts().count()>0);	103	attachbutton->setEnabled(body->Parts().count()>0);
104	attachments->setEnabled(body->Parts().count()>0);	104	attachments->setEnabled(body->Parts().count()>0);
105	if (body->Parts().count()==0)	105	if (body->Parts().count()==0)
106	{	106	{
107	return;	107	return;
108	}	108	}
109	AttachItem * curItem=0;	109	AttachItem * curItem=0;
@@ -296,20 +296,20 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
296	}	296	}
297		297
298		298
299	void ViewMail::setMail(const RecMailP&mail )	299	void ViewMail::setMail(const RecMailP&mail )
300	{	300	{
301		301
302	m_recMail = mail;	302	m_recMail = mail;
303		303
304	m_mail[0] = QString::fromUtf8( mail->getFrom().latin1() );	304	m_mail[0] = mail->getFrom();
305	m_mail[1] = QString::fromUtf8( mail->getSubject().latin1() );	305	m_mail[1] = mail->getSubject();
306	m_mail[3] = QString::fromUtf8( mail->getDate().latin1() );	306	m_mail[3] = mail->getDate();
307	m_mail[4] = QString::fromUtf8( mail->Msgid().latin1() );	307	m_mail[4] = mail->Msgid();
308		308
309	m_mail2[0] = mail->To();	309	m_mail2[0] = mail->To();
310	m_mail2[1] = mail->CC();	310	m_mail2[1] = mail->CC();
311	m_mail2[2] = mail->Bcc();	311	m_mail2[2] = mail->Bcc();
312		312
313	setText();	313	setText();
314	}	314	}
315		315
@@ -345,19 +345,19 @@ void ViewMail::readConfig()
345	void ViewMail::setText()	345	void ViewMail::setText()
346	{	346	{
347		347
348	QString toString;	348	QString toString;
349	QString ccString;	349	QString ccString;
350	QString bccString;	350	QString bccString;
351		351
352		352
353	toString = QString::fromUtf8(m_mail2[0].join(",").latin1());	353	toString = m_mail2[0].join(",");
354	ccString = QString::fromUtf8(m_mail2[1].join(",").latin1());	354	ccString = m_mail2[1].join(",");
355	bccString = QString::fromUtf8(m_mail2[2].join(",").latin1());	355	bccString = m_mail2[2].join(",");
356		356
357		357
358	setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );	358	setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
359		359
360	m_mailHtml = "<html><body>"	360	m_mailHtml = "<html><body>"
361	"<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"	361	"<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
362	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"	362	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
363	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"	363	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
@@ -445,19 +445,19 @@ void ViewMail::slotReply()
445		445
446	QString prefix;	446	QString prefix;
447	if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";	447	if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
448	else prefix = "Re: "; // no i18n on purpose	448	else prefix = "Re: "; // no i18n on purpose
449		449
450	Settings *settings = new Settings();	450	Settings *settings = new Settings();
451	ComposeMail composer( settings ,this, 0, true);	451	ComposeMail composer( settings ,this, 0, true);
452	if (m_recMail->Replyto().isEmpty()) {	452	if (m_recMail->Replyto().isEmpty()) {
453	composer.setTo( QString::fromUtf8( m_recMail->getFrom().latin1()));	453	composer.setTo(m_recMail->getFrom());
454	} else {	454	} else {
455	composer.setTo( QString::fromUtf8( m_recMail->Replyto().latin1()));	455	composer.setTo(m_recMail->Replyto());
456	}	456	}
457	composer.setSubject( prefix + m_mail[1] );	457	composer.setSubject( prefix + m_mail[1] );
458	composer.setMessage( rtext );	458	composer.setMessage( rtext );
459	composer.setInReplyTo(m_recMail->Msgid());	459	composer.setInReplyTo(m_recMail->Msgid());
460		460
461	if ( QDialog::Accepted == KApplication::execDialog( &composer ) )	461	if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
462	{	462	{
463	m_recMail->Wrapper()->answeredMail(m_recMail);	463	m_recMail->Wrapper()->answeredMail(m_recMail);