Swap recursing into the sibling parts with adjusting the crypto state of the current node. I can't prove this is behaviour-preserving (which is why this is a separate commit), but since nothing ever accesses partNode::mPrev, it should be pretty safe.

CCMAIL: khz@kde.org

svn path=/trunk/kdepim/; revision=258753
wilder-work
Marc Mutz 23 years ago
parent 8602d99c23
commit 191034a115
  1. 10
      objecttreeparser.cpp

@ -219,11 +219,6 @@ namespace KMail {
node->mWasProcessed = true;
}
// parse the siblings (children are parsed in the 'multipart' case terms)
// ### FIXME (mmutz): use iteration instead of recursion!
if ( !showOnlyOneMimePart() && node->mNext )
parseObjectTree( node->mNext );
// adjust signed/encrypted flags if inline PGP was found
// ### (mmutz) I think this is a bug if node->mWasProcessed is
@ -233,6 +228,11 @@ namespace KMail {
processResult.adjustCryptoStatesOfNode( node );
// end of ###
// parse the siblings (children are parsed in the 'multipart' case terms)
// ### FIXME (mmutz): use iteration instead of recursion!
if ( !showOnlyOneMimePart() && node->mNext )
parseObjectTree( node->mNext );
}
void ObjectTreeParser::defaultHandling( partNode * node, ProcessResult & result ) {

Loading…
Cancel
Save