Fix regressions in qtmail.experimental

Due to serviceactions changes.

1 files changed, 2 insertions, 4 deletions

diff --git a/examples/qtmail/app/emailclient.cpp b/examples/qtmail/app/emailclient.cpp
index f0759fcf..cae24f2c 100644
--- a/examples/qtmail/app/emailclient.cpp
+++ b/examples/qtmail/app/emailclient.cpp
@@ -2328,8 +2328,7 @@ void EmailClient::retrieveVisibleMessagesFlags()
     if (ids.isEmpty())
         return;
 
-    QMailServiceAction::Activity activity(m_flagRetrievalAction->activity());
-    if ((activity == QMailServiceAction::Pending) || (activity == QMailServiceAction::InProgress)) {
+    if (m_flagRetrievalAction->isRunning()) {
         // There is a flag retrieval already ocurring; save these IDs to be checked afterwards
         flagMessageIds += ids.toSet();
     } else {
@@ -2650,8 +2649,7 @@ void EmailClient::runNextPendingExport()
         return;
     }
     
-    if ((m_exportAction->activity() != QMailServiceAction::InProgress)
-        && (m_exportAction->activity() != QMailServiceAction::Pending)) {
+    if (!m_exportAction->isRunning()) {
         QMailAccountId mailAccountId = m_queuedExports.first();
         
         ServiceActionStatusItem* newItem = new ServiceActionStatusItem(m_exportAction, "Exporting pending updates");