From c8e1b254e243af4368f5430d8478f7a3a66d1fc6 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 9 Oct 2022 20:33:10 +0200 Subject: Distinguish between settings and explicit override for external content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: This will allow KMail to properly communicate the difference also when using per-folder settings for loading external references. This in turn makes 746e02af07f7dc223940ad80a0a234c0aff85850 also work in that case. Taken from KDE patches and adapted to TDE. See https://phabricator.kde.org/D12393 and https://phabricator.kde.org/D12394 Signed-off-by: Slávek Banko --- kmail/kmreadermainwin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kmail/kmreadermainwin.cpp') diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 336d4c16..0d74e87e 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -50,7 +50,7 @@ #include "kmreadermainwin.h" -KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, +KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name ) : KMail::SecondaryWindow( name ? name : "readerwindow#" ), mMsg( 0 ) @@ -59,7 +59,7 @@ KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, //mReaderWin->setShowCompleteMessage( true ); mReaderWin->setAutoDelete( true ); mReaderWin->setHtmlOverride( htmlOverride ); - mReaderWin->setHtmlLoadExtOverride( htmlLoadExtOverride ); + mReaderWin->setHtmlLoadExtDefault( htmlLoadExtDefault ); mReaderWin->setDecryptMessageOverwrite( true ); mReaderWin->setShowSignatureDetails( false ); initKMReaderMainWin(); -- cgit v1.2.3