diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-10-09 20:33:10 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-10-13 05:54:25 +0200 |
| commit | c8e1b254e243af4368f5430d8478f7a3a66d1fc6 (patch) | |
| tree | 9d51f004212c45f9cc4c2a7c5e634b43630ae46d /kmail/kmmainwidget.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 <slavek.banko@axis.cz>
Diffstat (limited to 'kmail/kmmainwidget.cpp')
| -rw-r--r-- | kmail/kmmainwidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index d5ba1f31..6240a19b 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -1386,7 +1386,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt() } mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref; if (mMsgView) { - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); mMsgView->update( true ); } } @@ -2084,7 +2084,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if (mMsgView) { mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); } mHeaders->setFolder( mFolder, forceJumpToUnread ); updateMessageActions(); @@ -2140,7 +2140,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } // reset HTML override to the folder setting mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtOverride(false); mMsgView->setDecryptMessageOverwrite( false ); mMsgView->setShowSignatureDetails( false ); } |