[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kmail
From:       Ingo Klöcker <kloecker () kde ! org>
Date:       2004-03-29 20:34:37
Message-ID: 20040329203437.49501990E () office ! kde ! org
[Download RAW message or body]

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);


[prev in list] [next in list] [prev in thread] [next in thread]