SVN commit 802861 by staniek:

merge trunk changes


 M  +3 -2      antispamwizard.cpp  
 M  +2 -2      antispamwizard.h  


--- branches/work/kmail-nommap/antispamwizard.cpp #802860:802861
@@ -1118,8 +1118,8 @@
             "to the selected folder.") );
   grid->addWidget( mMarkRules, 2, 0 );
 
-  QString s = "trash";
-  mFolderTree = new SimpleFolderTree( this, mainFolderTree, s, true );
+  mFolderTree = new FolderSelectionTreeWidget( this, mainFolderTree );
+  mFolderTree->reload( true , true , true , QString( "trash" ) );
   grid->addWidget( mFolderTree, 3, 0 );
 
   connect( mPipeRules, SIGNAL(clicked()),
@@ -1130,6 +1130,7 @@
             this, SLOT(processSelectionChange(void)) );
   connect( mMoveRules, SIGNAL( toggled( bool ) ),
            mMarkRules, SLOT( setEnabled( bool ) ) );
+
 }
 
 bool ASWizVirusRulesPage::pipeRulesSelected() const
--- branches/work/kmail-nommap/antispamwizard.h #802860:802861
@@ -48,7 +48,7 @@
 
 namespace KMail {
 
-  class SimpleFolderTree;
+  class FolderSelectionTreeWidget;
   class FolderRequester;
 
   class ASWizInfoPage;
@@ -384,7 +384,7 @@
     private:
       QCheckBox * mPipeRules;
       QCheckBox * mMoveRules;
-      SimpleFolderTree *mFolderTree;
+      FolderSelectionTreeWidget *mFolderTree;
       QCheckBox * mMarkRules;
   };