From b1db130fdd2308a3b990c3792898433d15a47311 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Sun, 8 Jan 2017 13:42:12 +0100 Subject: only show prefered alternative part for now --- framework/domain/messageparser_new.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/framework/domain/messageparser_new.cpp b/framework/domain/messageparser_new.cpp index c15958c6..cb399523 100644 --- a/framework/domain/messageparser_new.cpp +++ b/framework/domain/messageparser_new.cpp @@ -113,16 +113,25 @@ public: auto entry = new Entry(mNewModelPrivate); entry->mData = mNewModelPrivate->getVar(part); addChild(entry); - foreach(const auto &content, part->availableContents()) { - foreach(const auto &contentPart, part->content(content)) { - auto _entry = entry; - _entry = _entry->addEncryptions(contentPart->encryptions().mid(part->encryptions().size())); - _entry = _entry->addSignatures(contentPart->signatures().mid(part->signatures().size())); - auto c = new Entry(mNewModelPrivate); - c->mData = mNewModelPrivate->getVar(contentPart); - _entry->addChild(c); - } + + foreach(const auto &content, part->content()) { + auto _entry = entry; + _entry = _entry->addEncryptions(content->encryptions().mid(part->encryptions().size())); + _entry = _entry->addSignatures(content->signatures().mid(part->signatures().size())); + auto c = new Entry(mNewModelPrivate); + c->mData = mNewModelPrivate->getVar(content); + _entry->addChild(c); } +// foreach(const auto &content, part->availableContents()) { +// foreach(const auto &contentPart, part->content(content)) { +// auto _entry = entry; +// _entry = _entry->addEncryptions(contentPart->encryptions().mid(part->encryptions().size())); +// _entry = _entry->addSignatures(contentPart->signatures().mid(part->signatures().size())); +// auto c = new Entry(mNewModelPrivate); +// c->mData = mNewModelPrivate->getVar(contentPart); +// _entry->addChild(c); +// } +// } foreach(const auto &sp, part->subParts()) { auto _entry = entry; _entry = _entry->addEncryptions(sp->encryptions().mid(part->encryptions().size())); -- cgit v1.2.3