[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kmail (silent)
From: Thomas McGuire <mcguire () kde ! org>
Date: 2009-10-09 20:26:23
Message-ID: 1255119983.742675.4389.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1033267 by tmcguire:
SVN_SILENT fix indentation
M +34 -34 kmreaderwin.cpp
--- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #1033266:1033267
@@ -194,7 +194,7 @@
break;
case DwMime::kSubtypeEncrypted: {
if ( child )
- dataNode = child;
+ dataNode = child;
}
break;
}
@@ -271,45 +271,45 @@
}
if ( bKeepPartAsIs ) {
- resultingData += dataNode->encodedBody();
+ resultingData += dataNode->encodedBody();
} else {
- // B) Store the body of this part.
- if( headers && bIsMultipart && dataNode->firstChild() ) {
- kDebug() << "is valid Multipart, processing children:";
- QByteArray boundary = headers->ContentType().Boundary().c_str();
- curNode = dataNode->firstChild();
- // store children of multipart
- while( curNode ) {
- kDebug() << "--boundary";
- if( resultingData.size() &&
- ( '\n' != resultingData.at( resultingData.size()-1 ) ) )
+ // B) Store the body of this part.
+ if( headers && bIsMultipart && dataNode->firstChild() ) {
+ kDebug() << "is valid Multipart, processing children:";
+ QByteArray boundary = headers->ContentType().Boundary().c_str();
+ curNode = dataNode->firstChild();
+ // store children of multipart
+ while( curNode ) {
+ kDebug() << "--boundary";
+ if( resultingData.size() &&
+ ( '\n' != resultingData.at( resultingData.size()-1 ) ) )
+ resultingData += '\n';
resultingData += '\n';
- resultingData += '\n';
- resultingData += "--";
+ resultingData += "--";
+ resultingData += boundary;
+ resultingData += '\n';
+ // note: We are processing a harmless multipart that is *not*
+ // to be replaced by one of it's children, therefor
+ // we set their doStoreHeaders to true.
+ objectTreeToDecryptedMsg( curNode,
+ resultingData,
+ theMessage,
+ false,
+ recCount + 1 );
+ curNode = curNode->nextSibling();
+ }
+ kDebug() << "--boundary--";
+ resultingData += "\n--";
resultingData += boundary;
- resultingData += '\n';
- // note: We are processing a harmless multipart that is *not*
- // to be replaced by one of it's children, therefor
- // we set their doStoreHeaders to true.
- objectTreeToDecryptedMsg( curNode,
- resultingData,
- theMessage,
- false,
- recCount + 1 );
- curNode = curNode->nextSibling();
+ resultingData += "--\n\n";
+ kDebug() << "Multipart processing children - DONE";
+ } else if( part ){
+ // store simple part
+ kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE";
+ resultingData += part->Body().AsString().c_str();
}
- kDebug() << "--boundary--";
- resultingData += "\n--";
- resultingData += boundary;
- resultingData += "--\n\n";
- kDebug() << "Multipart processing children - DONE";
- } else if( part ){
- // store simple part
- kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE";
- resultingData += part->Body().AsString().c_str();
}
- }
} else {
kDebug() << "dataNode != curNode: Replace curNode by dataNode.";
bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic