1 files changed, 16 insertions, 11 deletions
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 5e163e19..56e69d37 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -134,12 +134,12 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName,
 {
   KURL msgURL;
   msgURL.setPath( msgPath );
-  
+
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
     KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
 
   DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags );
-  
+
   if ( !reply.isValid() )
   {
     info->alert( i18n( "<b>Fatal:</b> Unable to start KMail for DCOP communication. "
@@ -170,7 +170,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
 {
   KURL msgURL;
   msgURL.setPath( msgPath );
-  
+
   if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
     KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
 
@@ -197,17 +197,22 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
   return true;
 }
 
-bool Filter::endImport()
+void Filter::showKMailImportArchiveDialog( FilterInfo* info )
 {
-    if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+  if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
     KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started
 
-    DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call(  "dcopAddMessage", TQString::null, TQString::null);
-    if ( !reply.isValid() ) return false;
-
-    reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopResetAddMessage" );
-    if ( !reply.isValid() ) return false;
+  DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" );
+  if ( !reply.isValid() )
+  {
+    info->alert( i18n( "<b>Fatal:</b> Unable to start KMail for DCOP communication. "
+                       "Make sure <i>kmail</i> is installed." ) );
+  }
+}
 
-    return true;
+bool Filter::needsSecondPage()
+{
+  return true;
 }
+
 // vim: ts=2 sw=2 et