1 files changed, 12 insertions, 20 deletions
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index 17da8118..ff51759f 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -261,8 +261,6 @@ MessageServer::MessageServer(QObject *parent)
                 handler, SLOT(listActions()));
        connect(handler, SIGNAL(newMessagesAvailable()),
                 this, SLOT(reportNewCounts()));
-        connect(client, SIGNAL(acknowledgeNewMessages(QMailMessageTypeList)),
-                this, SLOT(acknowledgeNewMessages(QMailMessageTypeList)));
 
         QCopAdaptor::connect(this, SIGNAL(messageCountUpdated()),
              &messageCountUpdate, MESSAGE(changeValue()));
@@ -321,23 +319,6 @@ QMap<QMailMessage::MessageType, QString> typeSignatureInit()
     return map;
 }
 
-void MessageServer::acknowledgeNewMessages(const QMailMessageTypeList& types)
-{
-    foreach (QMailMessage::MessageType type, types) {
-        // No messages of this type are new any longer
-        QMailMessageKey newMessages(QMailMessageKey::messageType(type));
-        newMessages &= QMailMessageKey(QMailMessageKey::status(QMailMessage::New, QMailDataComparator::Includes));
-        QMailStore::instance()->updateMessagesMetaData(newMessages, QMailMessage::New, false);
-
-        if (messageCounts[type] != 0) {
-            newMessageTotal -= messageCounts[type];
-
-            messageCounts[type] = 0;
-            NewCountNotifier::notify(type, 0);
-        }
-    }
-}
-
 static QMap<QMailMessage::MessageType, QString> typeServiceInit()
 {
     QMap<QMailMessage::MessageType, QString> map;
@@ -414,7 +395,18 @@ void MessageServer::response(bool handled)
 {
     if (NewCountNotifier* action = static_cast<NewCountNotifier*>(sender())) {
         if (handled) {
-            acknowledgeNewMessages(QMailMessageTypeList() << actionType[action]);
+            QMailMessage::MessageType type(actionType[action]);
+            // No messages of this type are new any longer
+            QMailMessageKey newMessages(QMailMessageKey::messageType(type));
+            newMessages &= QMailMessageKey(QMailMessageKey::status(QMailMessage::New, QMailDataComparator::Includes));
+            QMailStore::instance()->updateMessagesMetaData(newMessages, QMailMessage::New, false);
+
+            if (messageCounts[type] != 0) {
+                newMessageTotal -= messageCounts[type];
+
+                messageCounts[type] = 0;
+                NewCountNotifier::notify(type, 0);
+            }
         }
         actionType.remove(action);
         action->deleteLater();