[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=02f5c46

The following commit has been merged in the master branch:
commit 02f5c46161ab558ef7a13eb153db998109224009
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri May 10 19:44:50 2013 +0100

    Fix messages not appearing when text channel reloads
    
    REVIEWED-BY: Sven Brauch
    BUG: 318549
---
 lib/chat-widget.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 36b3606..bd8974b 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -256,13 +256,21 @@ void ChatWidget::setChatEnabled(bool enable)
 
 void ChatWidget::setTextChannel(const Tp::TextChannelPtr &newTextChannelPtr)
 {
-    onContactPresenceChange(d->channel->groupSelfContact(), KTp::Presence(d->channel->groupSelfContact()->presence()));
 
     d->channel = newTextChannelPtr;     // set the new channel
     d->contactModel->setTextChannel(newTextChannelPtr);
 
     // connect signals for the new textchannel
     setupChannelSignals();
+
+    //if the UI is ready process any messages in queue
+    if (d->chatViewInitialized) {
+        Q_FOREACH (const Tp::ReceivedMessage &message, d->channel->messageQueue()) {
+            handleIncomingMessage(message, true);
+        }
+    }
+    setChatEnabled(true);
+    onContactPresenceChange(d->channel->groupSelfContact(), KTp::Presence(d->channel->groupSelfContact()->presence()));
 }
 
 Tp::TextChannelPtr ChatWidget::textChannel() const

-- 
ktp-text-ui packaging