from 3_1_BRANCH: Fix bug #47891: html messages is not printed as html

svn path=/trunk/kdenetwork/kmail/; revision=198531

kmcommands.cpp

@@ -830,8 +830,8 @@ void KMBounceCommand::execute()
 
 
 KMPrintCommand::KMPrintCommand( QWidget *parent,
-  KMMsgBase *msgBase )
-  : KMCommand( parent, msgBase)
+  KMMsgBase *msgBase, bool htmlOverride )
+  : KMCommand( parent, msgBase), mHtmlOverride( htmlOverride )
 {
 }
 
@@ -840,6 +840,7 @@ void KMPrintCommand::execute()
   KMReaderWin printWin( 0, 0, 0 );
   printWin.setPrinting(TRUE);
   printWin.readConfig();
+  printWin.setHtmlOverride( mHtmlOverride );
   printWin.setMsg(retrievedMessage(), TRUE);
   printWin.printMsg();
 }

kmcommands.h

@@ -349,10 +349,12 @@ class KMPrintCommand : public KMCommand
   Q_OBJECT
 
 public:
-  KMPrintCommand( QWidget *parent, KMMsgBase *msgBase );
+  KMPrintCommand( QWidget *parent, KMMsgBase *msgBase, bool htmlOverride=false );
 
 private:
   virtual void execute();
+
+  bool mHtmlOverride;
 };
 
 class KMSetStatusCommand : public KMCommand

kmreaderwin.h

@@ -155,6 +155,7 @@ public:
   void setAutoDelete(bool f) { mAutoDelete=f; }
 
   /** Override default html mail setting */
+  bool htmlOverride() const { return mHtmlOverride; }
   void setHtmlOverride( bool override );
 
   /** Is html mail to be supported? Takes into account override */