* 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, 3 insertions, 1 deletions

diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index a3f1a9b9..b8af0d0b 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -32,6 +32,7 @@
 #include "filter_opera.hxx"
 #include "filter_thunderbird.hxx"
 #include "filter_kmail_maildir.hxx"
+#include "filter_kmail_archive.hxx"
 #include "filter_sylpheed.hxx"
 #include "filter_thebat.hxx"
 #include "filter_lnotes.hxx"
@@ -49,6 +50,8 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilter
         // For now, we have to live without the warm and fuzzy feeling a refactoring might give. 
         // Patches appreciated. (danimo)
 
+        addFilter(new FilterKMailArchive);
+        addFilter(new FilterMBox);
         addFilter(new FilterEvolution);
         addFilter(new FilterEvolution_v2);
         addFilter(new FilterKMail_maildir);
@@ -60,7 +63,6 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilter
         addFilter(new FilterOE);
 //        addFilter(new FilterOutlook);
         addFilter(new FilterPMail);
-        addFilter(new FilterMBox);
         addFilter(new FilterLNotes);
         addFilter(new FilterPlain);
 }