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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-07-30 20:16:29
Message-ID: 1248984989.342476.16164.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004765 by tmcguire:

Make it work properly, before it quoted the wrong message.

Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.

MERGE: e35, e4


 M  +2 -2      templateparser.cpp  


--- trunk/KDE/kdepim/kmail/templateparser.cpp #1004764:1004765
@@ -912,7 +912,7 @@
 
   // No selection text, therefore we need to parse the object tree ourselves to get
   partNode *root = parsedObjectTree();
-  return mMsg->asPlainTextFromObjectTree( root, true, mAllowDecryption );
+  return mOrigMsg->asPlainTextFromObjectTree( root, true, mAllowDecryption );
 }
 
 partNode* TemplateParser::parsedObjectTree()
@@ -920,7 +920,7 @@
   if ( mOrigRoot )
     return mOrigRoot;
 
-  mOrigRoot = partNode::fromMessage( mMsg );
+  mOrigRoot = partNode::fromMessage( mOrigMsg );
   KMail::ObjectTreeParser otp; // all defaults are ok
   otp.parseObjectTree( mOrigRoot );
   return mOrigRoot;
[prev in list] [next in list] [prev in thread] [next in thread]