Fixed a stupid bug I just commited ;-)

svn path=/trunk/kdenetwork/kmail/; revision=8160

kmcomposewin.cpp

@@ -197,7 +197,7 @@ KMComposeWin::~KMComposeWin()
 void KMComposeWin::readConfig(void)
 {
   KConfig *config = kapp->getConfig();
-  QString str, bodyFont;
+  QString str;
   int w, h;
 
   config->setGroup("Composer");
@@ -214,8 +214,7 @@ void KMComposeWin::readConfig(void)
   mAutoPgpSign = config->readNumEntry("pgp-auto-sign", 0);
 
   config->setGroup("Fonts");
-  bodyFont = config->readEntry("body-font", "helvetica");
-  mEditor->setFont(QFont(bodyFont));
+  mBodyFont = config->readEntry("body-font", "helvetica");
 
 #ifdef CHARSETS  
   m7BitAscii = config->readNumEntry("7bit-is-ascii",1);
@@ -647,7 +646,7 @@ void KMComposeWin::setupEditor(void)
 
 
   // Font setup
-
+  mEditor->setFont(QFont(mBodyFont));
 
   // Color setup
   if( mForeColor.isEmpty())

kmcomposewin.h

@@ -295,7 +295,7 @@ protected:
   int mWordWrap;
   short mBtnIdSign, mBtnIdEncrypt;
   short mMnuIdUrgent, mMnuIdConfDeliver, mMnuIdConfRead;
-  QString mForeColor, mBackColor;
+  QString mForeColor, mBackColor, mBodyFont;
   QList<QLineEdit> mEdtList;
 #ifdef HAS_KSPELL
   KSpell* mKSpell;

kmfilter.cpp

@@ -32,13 +32,8 @@ static int findInStrList(const char* strList[], const char* str)
   if (!str) return -1;
 
   for (i=0; strList[i]; i++)
-    if (strcasecmp(strList[i], str)==0) 
-    {
-      debug("findInStrList: %s is at %d", str, i);
-      return i;
-    }
+    if (strcasecmp(strList[i], str)==0) return i;
 
-  debug("findInStrList: %s not found", str);
   return -1;
 }
 

kmmsglist.cpp

@@ -4,11 +4,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-// we need this for sorting.
-static KMMsgList::SortField sortCriteria;
-static int* sortIndex;
-static KMMsgList* sortList;
-static bool sortDescending;
 
 //-----------------------------------------------------------------------------
 KMMsgList::KMMsgList(int initSize): KMMsgListInherited(initSize)