[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=58e946e

The following commit has been merged in the master branch:
commit 58e946e8b20a8e7c39b57b62758912769c9bd2bc
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 21 17:39:04 2010 +0000

    Become ready on connection so selfContact is available.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177926
---
 lib/chatconnection.cpp | 6 +++++-
 lib/chatview.cpp       | 8 +++++---
 lib/chatview.h         | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/chatconnection.cpp b/lib/chatconnection.cpp
index 493e0b4..0bd8fb8 100644
--- a/lib/chatconnection.cpp
+++ b/lib/chatconnection.cpp
@@ -34,9 +34,13 @@ ChatConnection::ChatConnection(QObject *parent, const AccountPtr account, const
                            << TextChannel::FeatureMessageSentSignal
                            << TextChannel::FeatureChatState
                            << Channel::FeatureCore);
+        connect(op, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onChannelReady(Tp::PendingOperation*)));
+
+        //FIXME, we need to actually wait for this. Fortunately we can use factories soon.
+        connection->becomeReady(Features() << Connection::FeatureSelfContact
+                                << Connection::FeatureCore);
 
 
-        connect(op, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onChannelReady(Tp::PendingOperation*)));
     } else {
         qDebug() << "more than one channel?"; // I don't understand channels yet.
     }
diff --git a/lib/chatview.cpp b/lib/chatview.cpp
index a35160e..7f27539 100644
--- a/lib/chatview.cpp
+++ b/lib/chatview.cpp
@@ -136,7 +136,7 @@ void ChatView::initialise(const TelepathyChatInfo &chatInfo)
     templateHtml.replace(index, 2, footerHtml);
 
     setHtml(templateHtml);
-    lastSender = "";
+    m_lastSender = "";
 
     //hidden HTML debugging mode. Should have no visible way to turn it on.
     if (m_webInspector) {
@@ -196,11 +196,13 @@ void ChatView::addMessage(const TelepathyChatMessageInfo &message)
     QString styleHtml;
     bool consecutiveMessage = false;
 
+    qDebug() << m_lastSender;
+
     //FIXME "if group consecutive messages....{
-    if (lastSender == message.senderScreenName()) {
+    if (m_lastSender == message.senderScreenName()) {
         consecutiveMessage = true;
     } else {
-        lastSender = message.senderScreenName();
+        m_lastSender = message.senderScreenName();
     }
 
 
diff --git a/lib/chatview.h b/lib/chatview.h
index 11437df..735e288 100644
--- a/lib/chatview.h
+++ b/lib/chatview.h
@@ -65,7 +65,7 @@ private:
 
     TelepathyChatInfo m_chatInfo;
 
-    QString lastSender;
+    QString m_lastSender;
     bool m_displayHeader;
 
     void appendNewMessage(QString&);

-- 
ktp-text-ui packaging