Fix "After compact action mail list disappears", by ensuring that the

folder is open in the two places where it may be needed.

BUG:146967

svn path=/branches/KDE/3.5/kdepim/; revision=733841

compactionjob.cpp

@@ -65,7 +65,7 @@ void MboxCompactionJob::kill()
   Q_ASSERT( mCancellable );
   // We must close the folder if we opened it and got interrupted
   if ( mFolderOpen && mSrcFolder && mSrcFolder->storage() )
-    mSrcFolder->storage()->close("mboxcompactjob");
+    mSrcFolder->storage()->close("mboxcompact");
 
   if ( mTmpFile )
     fclose( mTmpFile );
@@ -124,7 +124,7 @@ int MboxCompactionJob::executeNow( bool silent )
     return errno;
   }
   mOpeningFolder = true; // Ignore open-notifications while opening the folder
-  storage->open("mboxcompactjob");
+  storage->open("mboxcompact");
   mOpeningFolder = false;
   mFolderOpen = true;
   mOffset = 0;

kmheaders.cpp

@@ -2418,6 +2418,8 @@ int KMHeaders::currentItemIndex()
 //-----------------------------------------------------------------------------
 void KMHeaders::setCurrentItemByIndex(int msgIdx)
 {
+  if (!mFolder->isOpened()) setFolder(mFolder);
+
   if ((msgIdx >= 0) && (msgIdx < (int)mItems.size())) {
     clearSelection();
     bool unchanged = (currentItem() == mItems[msgIdx]);
@@ -2426,6 +2428,7 @@ void KMHeaders::setCurrentItemByIndex(int msgIdx)
     setSelectionAnchor( currentItem() );
     if (unchanged)
        highlightMessage( mItems[msgIdx], false);
+    makeHeaderVisible();
   }
 }
 
@@ -2929,6 +2932,8 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
 
 bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
 {
+    if (!mFolder->isOpened()) mFolder->open("kmheaders");
+
     //all cases
     Q_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
     Q_INT32 deleted_count = 0;