Commit b713443e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 7c3e5133 b96be01b
Pipeline #24946 failed with stage
in 88 minutes and 28 seconds
......@@ -2204,8 +2204,6 @@ void ViewerPrivate::slotShowMessageSource()
if (!mMessage) {
return;
}
mNodeHelper->messageWithExtraContent(mMessage.data());
QPointer<MailSourceWebEngineViewer> viewer = new MailSourceWebEngineViewer; // deletes itself upon close
mListMailSourceViewer.append(viewer);
viewer->setWindowTitle(i18nc("@title:window", "Message as Plain Text"));
......
......@@ -101,7 +101,7 @@ public:
/** Return a modified message (node tree) starting from @param topLevelNode that has the original nodes and the extra nodes.
The caller has the responsibility to delete the new message.
*/
KMime::Message *messageWithExtraContent(KMime::Content *topLevelNode);
Q_REQUIRED_RESULT KMime::Message *messageWithExtraContent(KMime::Content *topLevelNode);
/** Get a QTextCodec suitable for this message part */
const QTextCodec *codec(KMime::Content *node);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment