Merge ...

SVN commit 644741 by coolo:

this checks looks nonsense as the ptr is regenerated on
every folder select
BUG#117785

svn path=/branches/kdepim/enterprise/kdepim/; revision=667941

kmmainwidget.cpp

@@ -1909,7 +1909,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
   bool newFolder = ( mFolder != aFolder );
   bool isNewImapFolder = aFolder && aFolder->folderType() == KMFolderTypeImap && newFolder;
   if( !mFolder
-      || ( !isNewImapFolder && mShowBusySplashTimer && !mShowBusySplashTimer->isActive() )
+      || ( !isNewImapFolder && mShowBusySplashTimer )
       || ( newFolder && mShowingOfflineScreen && !( isNewImapFolder && kmkernel->isOffline() ) ) ) {
     if ( mMsgView ) {
       mMsgView->enableMsgDisplay();