From ec89aa9b98815853a40ad360e8c5df7a09f2ed48 Mon Sep 17 00:00:00 2001
From: Andreas Gungl <a.gungl@gmx.de>
Date: Sun, 26 Dec 2004 20:10:02 +0000
Subject: [PATCH] Somehow reading local configs defaults to the global one if
 no local config is available. So we have to double the check for
 HeadersOnlyheader.

BUG: 95666

svn path=/trunk/kdepim/; revision=373432
---
 antispamwizard.cpp | 3 ++-
 antispamwizard.h   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/antispamwizard.cpp b/antispamwizard.cpp
index 5e0312439..5937bf482 100644
--- a/antispamwizard.cpp
+++ b/antispamwizard.cpp
@@ -582,7 +582,8 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
   for (int i = 1; i <= user_registeredTools; i++)
   {
     KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
-    mergeToolConfig( readToolConfig( toolConfig ) );
+    if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
+      mergeToolConfig( readToolConfig( toolConfig ) );
   }
   // Make sure to have add least one tool listed even when the
   // config file was not found or whatever went wrong
diff --git a/antispamwizard.h b/antispamwizard.h
index fe8898f39..28353f0d2 100644
--- a/antispamwizard.h
+++ b/antispamwizard.h
@@ -204,8 +204,8 @@ namespace KMail {
         public:
           ConfigReader( WizardMode mode,
                         QValueList<SpamToolConfig> & configList );
+          ~ConfigReader( );
 
-	~ConfigReader( );
           QValueList<SpamToolConfig> & getToolList() { return mToolList; }
 
           void readAndMergeConfig();
@@ -238,7 +238,7 @@ namespace KMail {
       /* generic checks if any option in a page is checked */
       bool anySpamOptionChecked();
       bool anyVirusOptionChecked();
-      
+
       /* convenience function calling the appropriate filter manager method */
       const QString uniqueNameFor( const QString & name );