[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=ac7b88c

The following commit has been merged in the master branch:
commit ac7b88c0f80f91792c22d428b8294026834aedc3
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 14:23:16 2012 +1100

    Fixed some further minor issues.
---
 KTp/Declarative/conversation-que-manager.cpp | 2 +-
 KTp/Declarative/conversation-que-manager.h   | 2 +-
 KTp/Declarative/messages-model.cpp           | 7 ++++---
 KTp/Declarative/messages-model.h             | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/KTp/Declarative/conversation-que-manager.cpp b/KTp/Declarative/conversation-que-manager.cpp
index dfec82f..dbdb426 100644
--- a/KTp/Declarative/conversation-que-manager.cpp
+++ b/KTp/Declarative/conversation-que-manager.cpp
@@ -31,7 +31,7 @@ void Queable::enqueSelf()
     m_queManager->enque(this);
 }
 
-void Queable::removeSelfFromQue()
+void Queable::removeSelfFromQueue()
 {
     m_queManager->remove(this);
 }
diff --git a/KTp/Declarative/conversation-que-manager.h b/KTp/Declarative/conversation-que-manager.h
index 25fdb77..98d3a37 100644
--- a/KTp/Declarative/conversation-que-manager.h
+++ b/KTp/Declarative/conversation-que-manager.h
@@ -33,7 +33,7 @@ protected:
     virtual ~Queable();
 
     void enqueSelf();
-    void removeSelfFromQue();
+    void removeSelfFromQueue();
     virtual void selfDequed() = 0;
 
 private:
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 47da2c4..bbc4da9 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -45,7 +45,7 @@ public:
     }
 };
 
-class MessagesModel::ConversationModelPrivate
+class MessagesModel::MessagesModelPrivate
 {
 public:
     Tp::TextChannelPtr textChannel;
@@ -55,7 +55,7 @@ public:
 
 MessagesModel::MessagesModel(QObject* parent):
         QAbstractListModel(parent),
-        d(new ConversationModelPrivate)
+        d(new MessagesModelPrivate)
 {
     kDebug();
 
@@ -116,6 +116,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
             //Tp::Message has an == operator. maybe I can use that?
             if (current.id == message.messageToken()) {
                 messageAlreadyInModel = true;
+                break;
             }
         }
         if (!messageAlreadyInModel) {
@@ -247,7 +248,7 @@ void MessagesModel::acknowledgeAllMessages()
     kDebug() << "Conversation Visible, Acknowledging " << queue.size() << " messages.";
 
     d->textChannel->acknowledge(queue);
-    removeSelfFromQue();
+    removeSelfFromQueue();
     Q_EMIT unreadCountChanged(queue.size());
 }
 
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 3d31e90..bcae07a 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -78,8 +78,8 @@ private:
     void removeChannelSignals(Tp::TextChannelPtr channel);
     virtual void selfDequed();
 
-    class ConversationModelPrivate;
-    ConversationModelPrivate *d;
+    class MessagesModelPrivate;
+    MessagesModelPrivate *d;
 };
 
 #endif // CONVERSATION_MODEL_H

-- 
ktp-common-internals packaging