summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro Knauß <[email protected]>2017-12-01 20:12:02 +0100
committerSandro Knauß <[email protected]>2017-12-01 20:14:11 +0100
commitc3dfe7d4d070f738d434383ae3d6d77520016540 (patch)
tree13724df30a99fc6279c5c516370f80a6113efac1
parentc34b57e78600cfb1700d4a9c45784e398fb18e0a (diff)
Make kmail build with uptodate messagelib
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/editor/kmcomposerwin.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce3b85c..26a7060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.6.90")
set(MAILCOMMON_LIB_VERSION_LIB "5.7.41")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.6.90")
-set(MESSAGELIB_LIB_VERSION_LIB "5.6.90")
+set(MESSAGELIB_LIB_VERSION_LIB "5.7.42")
set(LIBKLEO_LIB_VERSION_LIB "5.6.90")
set(PIMCOMMON_LIB_VERSION_LIB "5.6.90")
set(LIBKDEPIM_LIB_VERSION_LIB "5.6.90")
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index c82a985..7539b14 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -102,6 +102,7 @@
#include <MessageViewer/MessageViewerSettings>
#include <MimeTreeParser/ObjectTreeParser>
+#include <MimeTreeParser/SimpleObjectTreeSource>
#include <MimeTreeParser/NodeHelper>
#include <MessageComposer/Composer>
#include <MessageComposer/GlobalPart>
@@ -1622,9 +1623,9 @@ void KMComposerWin::setMessage(const KMime::Message::Ptr &newMsg, bool lastSignS
KMime::Content *msgContent = new KMime::Content;
msgContent->setContent(mMsg->encodedContent());
msgContent->parse();
- MessageViewer::EmptySource emptySource;
+ MimeTreeParser::SimpleObjectTreeSource emptySource;
MimeTreeParser::ObjectTreeParser otp(&emptySource); //All default are ok
- emptySource.setAllowDecryption(allowDecryption);
+ emptySource.setDecryptMessage(allowDecryption);
otp.parseObjectTree(msgContent);
bool shouldSetCharset = false;