[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim
From: Thomas McGuire <mcguire () kde ! org>
Date: 2008-11-07 17:57:09
Message-ID: 1226080629.317568.7725.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 881294 by tmcguire:
Merged revisions 861354 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/kmail-soc
........
r861354 | tmcguire | 2008-09-15 23:25:53 +0200 (Mon, 15 Sep 2008) | 1 line
Reduce the debug noise when selecting a message a bit.
........
_M . (directory)
M +0 -1 kmail/headerstyle.cpp
M +6 -6 kmail/imapaccountbase.cpp
M +0 -1 kmail/isubject.cpp
M +0 -1 kmail/kmmessage.cpp
M +0 -7 kmail/kmreaderwin.cpp
M +0 -4 kmail/objecttreeparser.cpp
M +1 -10 kmail/partNode.cpp
M +0 -1 kmail/spamheaderanalyzer.cpp
** trunk/KDE/kdepim #property svnmerge-integrated
- /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434 \
-835435,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,8 \
36404,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840 \
017,840019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,84375 \
2-843753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877093,877099,877101-877103,877128-877129,877481,877930 \
/branches/kdepim/kmail-soc:1-809833,812465,826213-826424 + \
/branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-813603 \
,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818695,8 \
18697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,829049-829 \
050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977-83499 \
2,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,835088- \
835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,835382-83 \
5383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434-8354 \
35,835437,835439-835440,835447,835451-835938,836295,836363,836390,836393-836394,836404 \
,836408,836472,836498,836510,836512,836524,837586,837719,837823,839641,839986-840017,8 \
40019-840127,841817,841844,841986,841990,842323,842333,842495,842562-843750,843752-843 \
753,843755-849403,849405-849784,849786-850255,850258-850261,850263-850305,850307-850329,850331-850387,850389-850421,850423-85
0483,850485-850486,850488-850497,850499-850502,850504-850505,850507-850509,850511,85 \
0513-850573,850575-851249,851251-851253,851256-851293,851297-851306,851308-851309,8513 \
12,851314-851316,851320,851322,851325-851328,851333,851336,851342,851349,851351-851352 \
,851354,851358,851360-851371,851373,851376,851378,851380,851384,851389,851391,851395-8 \
51397,851399-852143,852637,852652,852736,852743,852759,853293,853769,853818,853947-853 \
957,853973,853982,853985,854004,854007,854025,854085,854399,854550-854628,856089,85632 \
4,856353,856356,856361,856370,856384,856528,856547,856635,856673,856711,856725-856726, \
856729,856734,856739,856952,856974,857033,857036-857038,857040,857047,857055,857076,85 \
7081-857082,857085,857148,857290,857305,857308,857310,857380,857396,857410,857444,8574 \
86,857528,857531,857534,857738,857772,857783,857799,858454,858464,858487,858688,858732 \
,858746,858755,858823,858838,859400,859888,860040,860059,860265,861198,861561,861815,861913,863905,863970,864002,866383,866597,8666
82,866739,867069,867093,867475,867479,867497,868399-868400,868510,868512,868517,8685 \
33,868546,868795,868797,868813-868814,868935,869610,869627,869630,871375,872627-872628 \
,872861,872863,872887,872959,872969,873832,874391,874421,874707,874709,875182-875183,8 \
75188-875466,875468-875505,876312,876371,876380,876554,876637,876866,877028,877087,877093,877099,877101-877103,877128-877129,877481,877930 \
/branches/kdepim/kmail-soc:1-809833,812465,826213-826424,861354
--- trunk/KDE/kdepim/kmail/headerstyle.cpp #881293:881294
@@ -490,7 +490,6 @@
}
else // TODO: find a usable one
{
- kDebug( 5006 ) <<"Multiple / No addressees matched email address; Count is" << \
addresses.count(); userHTML = " ";
}
--- trunk/KDE/kdepim/kmail/imapaccountbase.cpp #881293:881294
@@ -1209,16 +1209,16 @@
}
for ( it = parts.begin(); it != parts.end(); ++it ) {
KMMessagePart *part = (*it);
- kDebug(5006) << "Load" << part->partSpecifier()
- << "(" << part->originalContentTypeStr() << ")";
+ //kDebug(5006) << "Load" << part->partSpecifier()
+ // << "(" << part->originalContentTypeStr() << ")";
if ( part->loadHeaders() ) {
- kDebug(5006) <<"load HEADER";
+ //kDebug(5006) <<"load HEADER";
FolderJob *job =
msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, \
part->partSpecifier()+".MIME" ); job->start();
}
if ( part->loadPart() ) {
- kDebug(5006) <<"load Part";
+ //kDebug(5006) <<"load Part";
FolderJob *job =
msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, \
part->partSpecifier() ); job->start();
@@ -1236,8 +1236,8 @@
KMMessagePart* part = new KMMessagePart( stream );
part->setParent( parentKMPart );
mBodyPartList.append( part );
- kDebug(5006) << "Created id" << part->partSpecifier()
- << "of type" << part->originalContentTypeStr();
+ //kDebug(5006) << "Created id" << part->partSpecifier()
+ // << "of type" << part->originalContentTypeStr();
DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part );
if ( parent ) {
--- trunk/KDE/kdepim/kmail/isubject.cpp #881293:881294
@@ -25,7 +25,6 @@
void ISubject::notify()
{
- kDebug(5006) << mObserverList.size();
for ( QVector<Interface::Observer*>::iterator it = mObserverList.begin() ; it != \
mObserverList.end() ; ++it ) (*it)->update( this );
}
--- trunk/KDE/kdepim/kmail/kmmessage.cpp #881293:881294
@@ -4045,7 +4045,6 @@
// search for the bodypart
mLastUpdated = findDwBodyPart( getFirstDwBodyPart(), specifier );
- kDebug(5006) << specifier;
if (!mLastUpdated)
{
kWarning(5006) << "Can not find part" << specifier;
--- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #881293:881294
@@ -912,7 +912,6 @@
{
if ( !mAtmUpdate ) {
// reparse the msg
- kDebug(5006) << "Message";
updateReaderWin();
return;
}
@@ -1190,7 +1189,6 @@
//-----------------------------------------------------------------------------
const QTextCodec * KMReaderWin::overrideCodec() const
{
- kDebug(5006) <<" mOverrideEncoding == '" << mOverrideEncoding <<"'";
if ( mOverrideEncoding.isEmpty() || mOverrideEncoding == "Auto" ) // Auto
return 0;
else
@@ -1565,10 +1563,6 @@
//-----------------------------------------------------------------------------
void KMReaderWin::parseMsg(KMMessage* aMsg)
{
-#ifndef NDEBUG
- kDebug( 5006 ) << "aMsg" << ( aMsg == message() ? "==" : "!=" ) << "aMsg )";
-#endif
-
KMMessagePart msgPart;
assert(aMsg!=0);
@@ -1713,7 +1707,6 @@
kDebug(5006) << "Invoce saving in decrypted form:";
emit replaceMsgByUnencryptedVersion();
} else {
- kDebug(5006) << "Finished parsing and displaying of message.";
showHideMimeTree( rootNodeCntType == DwMime::kTypeText &&
rootNodeCntSubtype == DwMime::kSubtypePlain );
}
--- trunk/KDE/kdepim/kmail/objecttreeparser.cpp #881293:881294
@@ -235,8 +235,6 @@
//-----------------------------------------------------------------------------
void ObjectTreeParser::parseObjectTree( partNode * node ) {
- kDebug() << (node ? "node OK, " : "no node, ")
- << "showOnlyOneMimePart: " << (showOnlyOneMimePart() ? "TRUE" : \
"FALSE");
if ( !node )
return;
@@ -1845,8 +1843,6 @@
if ( !mReader || !msgPart )
return;
- kDebug() << "writePartIcon: PartNum:" << partNum;
-
QString label = msgPart->fileName();
if( label.isEmpty() )
label = msgPart->name();
--- trunk/KDE/kdepim/kmail/partNode.cpp #881293:881294
@@ -127,7 +127,7 @@
root->buildObjectTree();
root->setFromAddress( msg->from() );
- root->dump();
+ //root->dump();
return root;
}
@@ -391,13 +391,6 @@
partNode* partNode::findType( int type, int subType, bool deep, bool wide )
{
-#ifndef NDEBUG
- DwString typeStr, subTypeStr;
- DwTypeEnumToStr( mType, typeStr );
- DwSubtypeEnumToStr( mSubType, subTypeStr );
- kDebug(5006) << "Is looking at" << typeStr.c_str()
- << "/" << subTypeStr.c_str();
-#endif
if( (mType != DwMime::kTypeUnknown)
&& ( (type == DwMime::kTypeUnknown)
|| (type == mType) )
@@ -493,8 +486,6 @@
// remove linebreak+whitespace from folded Content-Description
cntDesc.replace( QRegExp("\\n\\s*"), " " );
-kDebug(5006) <<" Inserting one item into MimePartTree";
-kDebug(5006) <<" Content-Type:" << cntType;
if( parentItem )
mMimePartTreeItem = new KMMimePartTreeItem( parentItem,
this,
--- trunk/KDE/kdepim/kmail/spamheaderanalyzer.cpp #881293:881294
@@ -43,7 +43,6 @@
// static
SpamScores SpamHeaderAnalyzer::getSpamScores( const KMMessage* message ) {
- kDebug(5006) ;
SpamScores scores;
SpamAgents agents = AntiSpamConfig::instance()->uniqueAgents();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic