diff options
| author | Slávek Banko <[email protected]> | 2022-10-09 20:33:10 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2022-10-13 05:54:25 +0200 |
| commit | c8e1b254e243af4368f5430d8478f7a3a66d1fc6 (patch) | |
| tree | 9d51f004212c45f9cc4c2a7c5e634b43630ae46d /kmail/kmreadermainwin.cpp | |
| parent | 746e02af07f7dc223940ad80a0a234c0aff85850 (diff) | |
| download | tdepim-c8e1b254e243af4368f5430d8478f7a3a66d1fc6.tar.gz tdepim-c8e1b254e243af4368f5430d8478f7a3a66d1fc6.zip | |
Distinguish between settings and explicit override for external content
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 <[email protected]>
Diffstat (limited to 'kmail/kmreadermainwin.cpp')
| -rw-r--r-- | kmail/kmreadermainwin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 336d4c162..0d74e87ee 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(); |