diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmailcvt/filters.cxx | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-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 'kmailcvt/filters.cxx')
| -rw-r--r-- | kmailcvt/filters.cxx | 27 |
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 |