[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=770624e

The following commit has been merged in the master branch:
commit 770624e69b2ebfea5867ae1bbd6227de0597b4d0
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri May 24 17:32:10 2013 +0200

    Only listen to loadFinished() when initializing theme
    
    Otherwise when a nested <iframe> from youtube plugin finishes
    loading, we end up in an infinite loop of reloading content
    
    Fixes regression introduced by 62bb42b610fc4d9228ed77a61dbef143658d8340
    
    BUG: 320221
    FIXED-IN: 0.7.0
    Reviewed-By: David Edmundson
---
 lib/chat-widget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index a57fe10..9fdbdb7 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -147,7 +147,6 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     setAcceptDrops(true);
 
     /* Prepare the chat area */
-    connect(d->ui.chatArea, SIGNAL(loadFinished(bool)), SLOT(chatViewReady()), Qt::QueuedConnection);
     connect(d->ui.chatArea, SIGNAL(zoomFactorChanged(qreal)), SIGNAL(zoomFactorChanged(qreal)));
     connect(d->ui.chatArea, SIGNAL(textPasted()), d->ui.sendMessageBox, SLOT(pasteSelection()));
     initChatArea();
@@ -648,6 +647,8 @@ void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
 
 void ChatWidget::chatViewReady()
 {
+    disconnect(d->ui.chatArea, SIGNAL(loadFinished(bool)), this, SLOT(chatViewReady()));
+
     if (!d->logsLoaded || d->exchangedMessagesCount > 0) {
         if (d->exchangedMessagesCount == 0) {
             d->logManager->fetchScrollback();
@@ -940,6 +941,8 @@ qreal ChatWidget::zoomFactor() const
 
 void ChatWidget::initChatArea()
 {
+    connect(d->ui.chatArea, SIGNAL(loadFinished(bool)), SLOT(chatViewReady()), Qt::QueuedConnection);
+
     d->ui.chatArea->load((d->isGroupChat ? AdiumThemeView::GroupChat : AdiumThemeView::SingleUserChat));
 
     AdiumThemeHeaderInfo info;

-- 
ktp-text-ui packaging