From kde-commits Thu Dec 31 20:09:27 2009 From: Thomas McGuire Date: Thu, 31 Dec 2009 20:09:27 +0000 To: kde-commits Subject: branches/work/akonadi-ports/kdepim (merge) Message-Id: <1262290167.250927.21849.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=126229017428213 SVN commit 1068312 by tmcguire: In the likely event that something here doesn't build, I'll fix that tomorrow. Happy new year! SVN_MERGE Merged revisions 1068248,1068258,1068273,1068279,1068287,1068301 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepim ........ r1068248 | tmcguire | 2009-12-31 17:37:55 +0100 (Thu, 31 Dec 2009) | 2 lines Follow kdepimlibs API changes ........ r1068258 | tmcguire | 2009-12-31 17:56:29 +0100 (Thu, 31 Dec 2009) | 2 lines Follow kdepimlibs API change ........ r1068273 | tmcguire | 2009-12-31 19:00:24 +0100 (Thu, 31 Dec 2009) | 2 lines Follow kdepimlibs API changes ........ r1068279 | tmcguire | 2009-12-31 19:18:56 +0100 (Thu, 31 Dec 2009) | 1 line Follow kdepimlibs API changes ........ r1068287 | tmcguire | 2009-12-31 20:07:46 +0100 (Thu, 31 Dec 2009) | 2 lines Follow kdepimlibs API changes ........ r1068301 | tmcguire | 2009-12-31 20:33:24 +0100 (Thu, 31 Dec 2009) | 1 line Follow kdepimlibs API changes. ........ _M . (directory) M +2 -2 kmail/kmcomposewin.cpp M +5 -5 runtime/agents/maildispatcher/outboxqueue.cpp M +24 -24 runtime/agents/maildispatcher/tests/aborttest.cpp M +3 -3 runtime/agents/maildispatcher/tests/dupetest.cpp --- branches/work/akonadi-ports/kdepim/kmail/kmcomposewin.cpp #1068311:1068312 @@ -3321,7 +3321,7 @@ //---------------------------------------------------------------------------- void KMComposeWin::slotSendLater() { - if ( !TransportManager::self()->promptCreateTransportIfNoneExists( this ) ) + if ( !TransportManager::self()->showTransportCreationDialog( this, TransportManager::IfNoTransportExists ) ) return; if ( !checkRecipientNumber() ) return; @@ -3374,7 +3374,7 @@ if ( !mEditor->checkExternalEditorFinished() ) { return; } - if ( !TransportManager::self()->promptCreateTransportIfNoneExists( this ) ) + if ( !TransportManager::self()->showTransportCreationDialog( this, TransportManager::IfNoTransportExists ) ) return; if ( !checkRecipientNumber() ) return; --- branches/work/akonadi-ports/kdepim/runtime/agents/maildispatcher/outboxqueue.cpp #1068311:1068312 @@ -149,7 +149,7 @@ const DispatchModeAttribute *mA = item.attribute(); Q_ASSERT( mA ); - if( mA->dispatchMode() == DispatchModeAttribute::Never ) { + if( mA->dispatchMode() == DispatchModeAttribute::Manual ) { kDebug() << "Item" << item.id() << "is queued to be sent manually."; return; } @@ -164,7 +164,7 @@ const SentBehaviourAttribute *sA = item.attribute(); Q_ASSERT( sA ); if( sA->sentBehaviour() == SentBehaviourAttribute::MoveToCollection && - sA->moveToCollection() < 0 ) { + !sA->moveToCollection().isValid() ) { kWarning() << "Item" << item.id() << "has invalid sent-mail collection."; return; } @@ -177,11 +177,11 @@ } */ - if( mA->dispatchMode() == DispatchModeAttribute::AfterDueDate && - mA->dueDate() > QDateTime::currentDateTime() ) { + if( mA->dispatchMode() == DispatchModeAttribute::Automatic && + mA->sendAfter().isValid() && mA->sendAfter() > QDateTime::currentDateTime() ) { // All the above was OK, so accept it for the future. kDebug() << "Item" << item.id() << "is accepted to be sent in the future."; - futureMap.insert( mA->dueDate(), item ); + futureMap.insert( mA->sendAfter(), item ); Q_ASSERT( !futureItems.contains( item ) ); futureItems.insert( item ); checkFuture(); --- branches/work/akonadi-ports/kdepim/runtime/agents/maildispatcher/tests/aborttest.cpp #1068311:1068312 @@ -108,9 +108,9 @@ void AbortTest::testAbort() { // Get the MDA interface. - DispatcherInterface *iface = DispatcherInterface::self(); - QVERIFY( iface->dispatcherInstance().isValid() ); - QVERIFY( iface->dispatcherInstance().isOnline() ); + DispatcherInterface iface; + QVERIFY( iface.dispatcherInstance().isValid() ); + QVERIFY( iface.dispatcherInstance().isOnline() ); // Create a large message. kDebug() << "Building message."; @@ -128,16 +128,16 @@ kDebug() << "Queuing message."; MessageQueueJob *qjob = new MessageQueueJob( this ); qjob->setMessage( msg ); - qjob->setTransportId( smtpTid ); + qjob->transportAttribute().setTransportId( smtpTid ); // default dispatch mode // default sent-mail collection - qjob->setFrom( "naiba" ); - qjob->setTo( QStringList( SPAM_ADDRESS ) ); - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + qjob->addressAttribute().setFrom( "naiba" ); + qjob->addressAttribute().setTo( QStringList( SPAM_ADDRESS ) ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); AKVERIFYEXEC( qjob ); // Wait for the MDA to begin dispatching. - for( int ds = 0; iface->dispatcherInstance().status() == AgentInstance::Idle; ds++ ) { + for( int ds = 0; iface.dispatcherInstance().status() == AgentInstance::Idle; ds++ ) { QTest::qWait( 100 ); if( ds % 10 == 0 ) { kDebug() << "Waiting for the MDA to begin dispatching." << ds / 10 << "seconds elapsed."; @@ -148,9 +148,9 @@ QTest::qWait( 100 ); // Tell the MDA to abort. - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Running ); - iface->dispatcherInstance().abortCurrentTask(); - for( int ds = 0; iface->dispatcherInstance().status() != AgentInstance::Idle; ds++ ) { + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Running ); + iface.dispatcherInstance().abortCurrentTask(); + for( int ds = 0; iface.dispatcherInstance().status() != AgentInstance::Idle; ds++ ) { QTest::qWait( 100 ); if( ds % 10 == 0 ) { kDebug() << "Waiting for the MDA to become idle after aborting." << ds / 10 << "seconds elapsed."; @@ -158,7 +158,7 @@ QVERIFY2( ds <= 100, "Timeout" ); } - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); // Verify that item has an ErrorAttribute. ItemFetchJob *fjob = new ItemFetchJob( outbox ); @@ -190,20 +190,20 @@ QVERIFY2( ds <= 100, "Timeout" ); } QCOMPARE( addSpy->count(), 1 ); - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); } void AbortTest::testAbortWhileIdle() { // Get the MDA interface. - DispatcherInterface *iface = DispatcherInterface::self(); - QVERIFY( iface->dispatcherInstance().isValid() ); - QVERIFY( iface->dispatcherInstance().isOnline() ); + DispatcherInterface iface; + QVERIFY( iface.dispatcherInstance().isValid() ); + QVERIFY( iface.dispatcherInstance().isOnline() ); // Abort thin air. - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); - iface->dispatcherInstance().abortCurrentTask(); - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); + iface.dispatcherInstance().abortCurrentTask(); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); // Queue a message (to check that subsequent messages are being sent). QVERIFY( monitor ); @@ -212,12 +212,12 @@ msg->setContent( "\ntestAbortWhileIdle" ); MessageQueueJob *qjob = new MessageQueueJob( this ); qjob->setMessage( msg ); - qjob->setTransportId( akoTid ); + qjob->transportAttribute().setTransportId( akoTid ); // default dispatch mode // default sent-mail collection - qjob->setFrom( "naiba" ); - qjob->setTo( QStringList( "dracu" ) ); - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + qjob->addressAttribute().setFrom( "naiba" ); + qjob->addressAttribute().setTo( QStringList( "dracu" ) ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); AKVERIFYEXEC( qjob ); // Verify that the item got sent. @@ -226,7 +226,7 @@ QVERIFY2( s <= 10, "Timeout" ); } QCOMPARE( addSpy->count(), 1 ); - QCOMPARE( iface->dispatcherInstance().status(), AgentInstance::Idle ); + QCOMPARE( iface.dispatcherInstance().status(), AgentInstance::Idle ); } QTEST_AKONADIMAIN( AbortTest, NoGUI ) --- branches/work/akonadi-ports/kdepim/runtime/agents/maildispatcher/tests/dupetest.cpp #1068311:1068312 @@ -147,11 +147,11 @@ MessageQueueJob *job = new MessageQueueJob( this ); job->setMessage( msg ); - job->setTransportId( TransportManager::self()->defaultTransportId() ); + job->transportAttribute().setTransportId( TransportManager::self()->defaultTransportId() ); // default dispatch mode // default sent-mail collection - job->setFrom( "naiba" ); - job->setTo( QStringList( "dracu" ) ); + job->addressAttribute().setFrom( "naiba" ); + job->addressAttribute().setTo( QStringList( "dracu" ) ); //AKVERIFYEXEC( job ); job->start(); QTest::qWait( delay );