* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 4 deletions

diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index e01093fd..17d7ed1e 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -34,7 +34,6 @@
 #include "kmfilteraction.h"
 #include "kmfiltermgr.h"
 #include "kmkernel.h"
-#include "kmfolderseldlg.h"
 #include "kmfoldertree.h"
 #include "kmmainwin.h"
 #include "networkaccount.h"
@@ -428,7 +427,13 @@ void AntiSpamWizard::accept()
     classHamFilter->setConfigureShortcut( true );
     classHamFilter->setConfigureToolbar( true );
     filterList.append( classHamFilter );
-  }
+    }
+
+    /* Now that all the filters have been added to the list, tell
+     * the filter manager about it. That will emit filterListUpdate
+     * which will result in the filter list in kmmainwidget being
+     * initialized. This should happend only once. */
+    KMKernel::self()->filterMgr()->appendFilters( filterList );
 
   /* Now that all the filters have been added to the list, tell
    * the filter manager about it. That will emit filterListUpdate
@@ -834,9 +839,8 @@ ASWizPage::ASWizPage( TQWidget * parent, const char * name,
     banner = *bannerName;
 
   mLayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-  mPixmap = new TQPixmap( UserIcon(banner) );
   mBannerLabel = new TQLabel( this );
-  mBannerLabel->setPixmap( *mPixmap );
+  mBannerLabel->setPixmap( UserIcon(banner) );
   mBannerLabel->setScaledContents( false );
   mBannerLabel->setFrameShape( TQFrame::StyledPanel );
   mBannerLabel->setFrameShadow( TQFrame::Sunken );