Merge branch 'master' of git@scm.dev.nokia.troll.no:addons/messagingframework

3 files changed, 14 insertions, 19 deletions

diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
index d5ad96c4..a1fe945e 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -1089,7 +1089,7 @@ static QList<QPair<QByteArray, uint> > dataSequence(QList<QMailMessage::MessageC
         }
 
         // We're finished with this chunk
-        chunks.takeFirst();
+        chunks.removeFirst();
     }
 
     if (!sequence.isEmpty()) {
@@ -1130,7 +1130,7 @@ QString AppendState::transmit(ImapContext *c)
             cmd.append(params.mData.first().first.mid(1));
             length = params.mData.first().second;
 
-            params.mData.takeFirst();
+            params.mData.removeFirst();
             if (params.mData.isEmpty()) {
                 // We have no literal data to send
                 cmd.append(")");
diff --git a/src/plugins/messageservices/imap/imapstrategy.cpp b/src/plugins/messageservices/imap/imapstrategy.cpp
index a37d49fc..c3162bcf 100644
--- a/src/plugins/messageservices/imap/imapstrategy.cpp
+++ b/src/plugins/messageservices/imap/imapstrategy.cpp
@@ -660,7 +660,7 @@ void ImapPrepareMessagesStrategy::newConnection(ImapStrategyContextBase *context
             QString url(ImapProtocol::url(pair.first, false, true));
             urlAuthorized(context, url);
 
-            _locations.takeFirst();
+            _locations.removeFirst();
         }
 
         context->operationCompleted();
@@ -707,7 +707,7 @@ void ImapPrepareMessagesStrategy::handleLogin(ImapStrategyContextBase *context)
 void ImapPrepareMessagesStrategy::handleGenUrlAuth(ImapStrategyContextBase *context)
 {
     // We're finished with the previous location
-    _locations.takeFirst();
+    _locations.removeFirst();
 
     nextMessageAction(context);
 }
@@ -3154,7 +3154,7 @@ void ImapExternalizeMessagesStrategy::transition(ImapStrategyContextBase *contex
 void ImapExternalizeMessagesStrategy::handleGenUrlAuth(ImapStrategyContextBase *context)
 {
     // We're finished with the previous location
-    _urlIds.takeFirst();
+    _urlIds.removeFirst();
 
     resolveNextMessage(context);
 }
diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index 78c49db0..6112248c 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -827,7 +827,7 @@ void ServiceHandler::dispatchRequest()
                 mServiceAction.remove(service);
         }
 
-        mRequests.takeFirst();
+        mRequests.removeFirst();
     }
 }
 
@@ -1716,29 +1716,24 @@ bool ServiceHandler::dispatchSearchMessages(quint64 action, const QByteArray &da
     QMailMessageKey filter;
     QString bodyText;
     QMailMessageSortKey sort;
+    bool sentSearch = false;
+
 
     deserialize(data, accountIds, filter, bodyText, sort);
 
     foreach (const QMailAccountId &accountId, accountIds) {
         if (QMailMessageSource *source = accountSource(accountId)) {
-            if (!source->searchMessages(filter, bodyText, sort)) {
+            if (source->searchMessages(filter, bodyText, sort)) {
+                sentSearch = true; //we've at least sent one
+            } else {
                 qMailLog(Messaging) << "Unable to service request to search messages for account:" << accountId;
-                return false;
             }
         } else {
             reportFailure(action, QMailServiceAction::Status::ErrFrameworkFault, tr("Unable to locate source for account"), accountId);
-            return false;
         }
     }
 
-    // Find the messages that match the filter criteria
-    QMailMessageIdList searchIds = QMailStore::instance()->queryMessages(filter, sort);
-
-    // Schedule this search
-    mSearches.append(MessageSearch(action, searchIds, bodyText));
-    QTimer::singleShot(0, this, SLOT(continueSearch()));
-
-    return true;
+    return sentSearch;
 }
 
 void ServiceHandler::cancelSearch(quint64 action)
@@ -2028,7 +2023,7 @@ void ServiceHandler::continueSearch()
                 // There is remote searching in progress - wait for completion
             } else {
                 // We're finished with this search
-                mSearches.takeFirst();
+                mSearches.removeFirst();
 
                 if (!mSearches.isEmpty())
                     QTimer::singleShot(0, this, SLOT(continueSearch()));
@@ -2053,7 +2048,7 @@ void ServiceHandler::finaliseSearch(quint64 action)
                 // This search is now finished
                 emit searchCompleted(currentSearch.action());
 
-                mSearches.takeFirst();
+                mSearches.removeFirst();
 
                 if (!mSearches.isEmpty())
                     QTimer::singleShot(0, this, SLOT(continueSearch()));