[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=2b0efd7

The following commit has been merged in the master branch:
commit 2b0efd741655d48b55458a190bf554bbeb8a7119
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 8 19:55:33 2013 +0200

    Automatically acknowledge delivery reports of sent messages
    
    This solves a bug in which the chat plasmoid could show an unread
    message count when there are no unread messages
---
 KTp/Declarative/messages-model.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 2c15c27..0068616 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -117,11 +117,17 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
     int unreadCount = d->textChannel->messageQueue().size();
     kDebug() << "unreadMessagesCount =" << unreadCount;
     kDebug() << "text =" << message.text();
+    kDebug() << "messageType = " << message.messageType();
     kDebug() << "messageToken =" << message.messageToken();
 
-    if (message.messageType() == Tp::ChannelTextMessageTypeNormal ||
-        message.messageType() == Tp::ChannelTextMessageTypeAction) {
+    //delivery reports do not contain message text, everything else does.
+    //simply ack these straight away
 
+    //TODO search through d->messages() for messages with identical messageToken and update sending state as appropriate
+
+    if (message.messageType() == Tp::ChannelTextMessageTypeDeliveryReport) {
+        d->textChannel->acknowledge(QList<Tp::ReceivedMessage>() << message);
+    } else {
         int length = rowCount();
         beginInsertRows(QModelIndex(), length, length);
 
@@ -138,7 +144,6 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
             Q_EMIT unreadCountChanged(unreadCount);
         }
     }
-
 }
 
 void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags, const QString &messageToken)
@@ -152,7 +157,6 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
 
     d->messages.append(KTp::MessageProcessor::instance()->processIncomingMessage(
                            message, d->account, d->textChannel));
-
     endInsertRows();
 }
 
@@ -245,8 +249,7 @@ int MessagesModel::unreadCount() const
 
 void MessagesModel::acknowledgeAllMessages()
 {
-    QList<Tp::ReceivedMessage> queue
-    = d->textChannel->messageQueue();
+    QList<Tp::ReceivedMessage> queue = d->textChannel->messageQueue();
 
     kDebug() << "Conversation Visible, Acknowledging " << queue.size() << " messages.";
 

-- 
ktp-common-internals packaging