From ae123a9fba9a5902a3aff3da44d88e4090cbc8e7 Mon Sep 17 00:00:00 2001
From: Pradeepto Bhattacharya <pradeepto@kde.org>
Date: Tue, 2 Sep 2008 07:48:24 +0000
Subject: [PATCH] Merged revisions 785316 via svnmerge from
 svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r785316 | ahartmetz | 2008-03-14 01:14:33 +0530 (Fri, 14 Mar 2008) | 1 line

  readability++
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=856089
---
 kmailicalifaceimpl.cpp | 4 ++--
 kmkernel.cpp           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kmailicalifaceimpl.cpp b/kmailicalifaceimpl.cpp
index b89af0ee2..001672c5e 100644
--- a/kmailicalifaceimpl.cpp
+++ b/kmailicalifaceimpl.cpp
@@ -1401,7 +1401,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
     // Notify that the old folder resource is no longer available
     emit subresourceDeleted( folderContentsType( folder->storage()->contentsType() ), location );
 
-    if ( contentsType == 0 ) {
+    if ( contentsType == KMail::ContentsTypeMail ) {
       // Delete the old entry, stop listening and stop here
       delete mExtraFolders.take( location );
       folder->disconnect( this );
@@ -1411,7 +1411,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
   } else {
     if ( ef && !ef->folder ) // deleted folder, clean up
       delete mExtraFolders.take( location );
-    if ( contentsType == 0 )
+    if ( contentsType == KMail::ContentsTypeMail )
         return;
 
     //kDebug() << "registering" << location <<" as extra folder";
diff --git a/kmkernel.cpp b/kmkernel.cpp
index 0a540c5f9..5d6a9f7b0 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -1469,7 +1469,7 @@ void KMKernel::init()
   mBackgroundTasksTimer->setSingleShot( true );
   connect( mBackgroundTasksTimer, SIGNAL( timeout() ), this, SLOT( slotRunBackgroundTasks() ) );
 #ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h
-  mBackgroundTasksTimer->start( 10000 ); // 10s minute, singleshot
+  mBackgroundTasksTimer->start( 10000 ); // 10s, singleshot
 #else
   mBackgroundTasksTimer->start( 5 * 60000 ); // 5 minutes, singleshot
 #endif