From kde-commits  Mon Mar 29 20:34:37 2004
From: =?utf-8?q?Ingo=20Kl=C3=B6cker?= <kloecker () kde ! org>
Date: Mon, 29 Mar 2004 20:34:37 +0000
To: kde-commits
Subject: KDE_3_2_BRANCH: kdepim/kmail
Message-Id: <20040329203437.49501990E () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108059248100585

CVS commit by kloecker: 

Backport CVS commit by kloecker: 

Convert the contents of the message file in the dcop call openComposer(QString to,QString cc,QString bcc,QString subject,QString body,int hidden,KURL messageFile) from local encoding to utf-8.


  M +3 -3      kmkernel.cpp   1.235.2.2


--- kdepim/kmail/kmkernel.cpp  #1.235.2.1:1.235.2.2
@@ -320,8 +320,8 @@ int KMKernel::openComposer (const QStrin
     QCString str = kFileToString( messageFile.path(), true, false );
     if( !str.isEmpty() )
-      msg->setBody( str );
+      msg->setBody( QString::fromLocal8Bit( str ).utf8() );
   }
-
-  if (!body.isEmpty()) msg->setBody(body.utf8());
+  else if (!body.isEmpty())
+    msg->setBody(body.utf8());
 
   KMComposeWin *cWin = new KMComposeWin(msg);