fix default sorting order to be date ascending again

svn path=/trunk/KDE/kdepim/; revision=496821

kmheaders.cpp

@@ -115,6 +115,8 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
   mSortInfo.fakeSort = 0;
   mSortInfo.removed = 0;
   mSortInfo.column = 0;
+  mSortCol = 2; // 2 == date
+  mSortDescending = false;
   mSortInfo.ascending = false;
   mReaderWindowActive = false;
   mRoot = new SortCacheItem;
@@ -139,9 +141,6 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
 
   connect(mPopup, SIGNAL(activated(int)), this, SLOT(slotToggleColumn(int)));
 
-  mSortCol = 3; // 3 == date
-  mSortDescending = false;
-
   setShowSortIndicator(true);
   setFocusPolicy( Qt::WheelFocus );
 
@@ -573,7 +572,7 @@ void KMHeaders::readFolderConfig (void)
 
   KConfigGroup config( KMKernel::config(), "Folder-" + mFolder->idString() );
   mNestedOverride = config.readEntry( "threadMessagesOverride", QVariant( false ) ).toBool();
-  mSortCol = config.readEntry( "SortColumn", QVariant( mSortCol /* inited to date column */) ).toInt();
+  mSortCol = config.readEntry( "SortColumn", QVariant( mSortCol  + 1 /* inited to date column */) ).toInt();
   mSortDescending = (mSortCol < 0);
   mSortCol = abs(mSortCol) - 1;
 
@@ -2461,6 +2460,7 @@ void KMHeaders::setSorting( int column, bool ascending )
         mSortInfo.dirty = true;
     }
 
+    assert(column >= 0);
     mSortCol = column;
     mSortDescending = !ascending;
 
@@ -2595,6 +2595,7 @@ bool KMHeaders::writeSortOrder()
         kmb = mFolder->getMsgBase( i->msgId() );
         assert(kmb); // I have seen 0L come out of this, called from
                    // KMHeaders::setFolder(0xgoodpointer, false);
+                   // I see this crash too. after rebuilding a broken index on a dimap folder. always
         QString replymd5 = kmb->replyToIdMD5();
         QString replyToAuxId = kmb->replyToAuxIdMD5();
         SortCacheItem *p = NULL;