2 files changed, 1 insertions, 74 deletions
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index 86710dd9..d5d5c8a9 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -69,8 +69,7 @@ int MessageServer::sigintFd[2];
 
 MessageServer::MessageServer(QObject *parent)
     : QObject(parent),
-      handler(nullptr),
-      completionAttempted(false)
+      handler(nullptr)
 {
     readLogSettings();
 }
@@ -138,13 +137,6 @@ bool MessageServer::init()
         qCWarning(lcMessaging) << "Messaging DB Invalid: Messaging cannot operate due to database incompatibilty!";
         // Do not close, however, or QPE will start another instance.
         return false;
-    } else {
-        connect(store, SIGNAL(messagesAdded(QMailMessageIdList)),
-                this, SLOT(messagesAdded(QMailMessageIdList)));
-        connect(store, SIGNAL(messagesUpdated(QMailMessageIdList)),
-                this, SLOT(messagesUpdated(QMailMessageIdList)));
-        connect(store, SIGNAL(messagesRemoved(QMailMessageIdList)),
-                this, SLOT(messagesRemoved(QMailMessageIdList)));
     }
 
     // Register our object on the session bus and expose interface to others.
@@ -186,18 +178,6 @@ void MessageServer::retrievalCompleted(quint64 action)
     // Ensure the client receives any resulting events before a notification
     QMailStore::instance()->flushIpcNotifications();
 
-    if (!completionList.isEmpty()) {
-        if (!completionAttempted) {
-            // Complete the messages that we selected for immediate completion
-            completionAttempted = true;
-            handler->retrieveMessages(action, completionList.values(), QMailRetrievalAction::Content);
-            return;
-        } else {
-            completionList.clear();
-        }
-    }
-
-    completionAttempted = false;
     emit handler->retrievalCompleted(action);
 }
 
@@ -209,52 +189,6 @@ void MessageServer::transmissionCompleted(quint64 action)
     emit handler->transmissionCompleted(action);
 }
 
-void MessageServer::messagesAdded(const QMailMessageIdList &ids)
-{
-    if (!QMailStore::instance()->asynchronousEmission()) {
-        // Added in our process - from retrieval
-        foreach (const QMailMessageId &id, ids) {
-            QMailMessageMetaData message(id);
-
-            bool complete(false);
-            if (!(message.status() & QMailMessage::ContentAvailable)) {
-                // Automatically download voicemail messages
-                if (message.content() == QMailMessage::VoicemailContent
-                    || message.content() == QMailMessage::VideomailContent) {
-                    complete = true;
-                }
-            }
-
-            if (complete)
-                completionList.insert(message.id());
-        }
-    }
-}
-
-void MessageServer::messagesUpdated(const QMailMessageIdList &ids)
-{
-    if (!QMailStore::instance()->asynchronousEmission()) {
-        // If we're updating, check whether the messages have been marked as Removed
-        foreach (const QMailMessageId &id, ids) {
-            if (completionList.contains(id)) {
-                QMailMessageMetaData message(id);
-                if ((message.status() & QMailMessage::ContentAvailable) || (message.status() & QMailMessage::Removed)) {
-                    // This message has been completed (or removed)
-                    completionList.remove(id);
-                }
-            }
-        }
-    }
-}
-
-void MessageServer::messagesRemoved(const QMailMessageIdList &ids)
-{
-    foreach (const QMailMessageId &id, ids) {
-        // No need to complete deleted messages
-        completionList.remove(id);
-    }
-}
-
 void MessageServer::cleanupTemporaryMessages()
 {
     QMailStore::instance()->removeMessages(QMailMessageKey::status(QMailMessage::Temporary), QMailStore::NoRemovalRecord);
diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h
index 8308973c..d21bd22b 100644
--- a/src/tools/messageserver/messageserver.h
+++ b/src/tools/messageserver/messageserver.h
@@ -76,10 +76,6 @@ private slots:
 
     void transmissionCompleted(quint64 action);
 
-    void messagesAdded(const QMailMessageIdList &ids);
-    void messagesUpdated(const QMailMessageIdList &ids);
-    void messagesRemoved(const QMailMessageIdList &ids);
-
     void cleanupTemporaryMessages();
 
 private:
@@ -87,9 +83,6 @@ private:
 
     ServiceHandler *handler;
 
-    QSet<QMailMessageId> completionList;
-    bool completionAttempted;
-
 #ifdef MESSAGESERVER_PLUGINS
     QList<QMailMessageServerService*> m_plugins;
 #endif