summaryrefslogtreecommitdiffstats
path: root/kmail/antispamwizard.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/antispamwizard.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'kmail/antispamwizard.cpp')
-rw-r--r--kmail/antispamwizard.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index e01093fd3..17d7ed1ed 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 );