summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-20 16:41:51 +0200
committerMontel Laurent <[email protected]>2015-08-20 16:41:51 +0200
commit4c114081780aa4b8c911a1ed6e88b49d061ac40e (patch)
treeb08f50d84f0aeaa078ad8244b0127c3accf8d515
parent87a7413b1ea29ee5c34e0cee61faf3d5370e7294 (diff)
Oops. Readd message header
-rw-r--r--messageviewer/viewer/viewer_p.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/messageviewer/viewer/viewer_p.cpp b/messageviewer/viewer/viewer_p.cpp
index 3ff07b4..d684c6e 100644
--- a/messageviewer/viewer/viewer_p.cpp
+++ b/messageviewer/viewer/viewer_p.cpp
@@ -961,17 +961,24 @@ void ViewerPrivate::parseContent(KMime::Content *content)
if (!vCardContent) {
vCardContent = findContentByType(content, "text/directory");
}
-
+ bool hasVCard = false;
if (vCardContent) {
// ### FIXME: We should only do this if the vCard belongs to the sender,
// ### i.e. if the sender's email address is contained in the vCard.
const QByteArray vCard = vCardContent->decodedContent();
KContacts::VCardConverter t;
if (!t.parseVCards(vCard).isEmpty()) {
+ hasVCard = true;
mNodeHelper->writeNodeToTempFile(vCardContent);
}
}
+ KMime::Message *message = dynamic_cast<KMime::Message *>(content);
+ if (message) {
+ htmlWriter()->queue(writeMsgHeader(message, hasVCard ? vCardContent : 0, true));
+ }
+
+
// Pass control to the OTP now, which does the real work
mNodeHelper->removeTempFiles();
mNodeHelper->setNodeUnprocessed(mMessage.data(), true);