kdenetwork/kmail

[CVS by haeckel]

kdenetwork/kmail kmmessage.cpp,1.133,1.134
Author: haeckel
Wed Oct 18 18:56:31 UTC 2000

Modified Files:
	kmmessage.cpp 
Log Message:
Fix for Bug#13027. KMail inserted a charset="" header when forwarding a mail
with attachment.

diff -u -3 -p -r1.133 kmmessage.cpp
--- kdenetwork/kmail/kmmessage.cpp      2000/10/11 18:07:49     1.133
+++ kdenetwork/kmail/kmmessage.cpp      2000/10/18 18:54:42
@@ -888,7 +888,7 @@ KMMessage* KMMessage::createForward(void
   }

   msg->setCharset(charset());
-  msg->setBody(str);
+  if (!charset().isEmpty()) msg->setBody(str);

   if (numBodyParts() > 0)
   {
@@ -912,7 +912,6 @@ KMMessage* KMMessage::createForward(void
   if (strnicmp(subject(), "Fwd:", 4)!=0)
     msg->setSubject("Fwd: " + subject());
   else msg->setSubject(subject());
-  msg->setCharset(charset());
   setStatus(KMMsgStatusForwarded);

   return msg;