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

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:23:49 UTC 2016


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

The following commit has been merged in the master branch:
commit b867ba93e6b83827c144b31d9505d7c5f05df2b6
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Apr 11 17:26:35 2013 +0200

    Don't reload webpage from KWebView's signal handler
    
    Fixes a crash when clicking the Previous/Next Conversation
    links crashes logviewer.
---
 logviewer/message-view.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index 8fdd6f5..a86c3ff 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -174,13 +174,22 @@ void MessageView::processStoredEvents()
 
 void MessageView::onLinkClicked(const QUrl &link)
 {
+    // Don't emit the signal directly, KWebView does not like when we reload the
+    // page from an event handler (and then chain up) and we can't guarantee
+    // that everyone will use QueuedConnection when connecting to
+    // conversationSwitchRequested() slot
+
     if (link.fragment() == QLatin1String("x-nextConversation")) {
-        Q_EMIT conversationSwitchRequested(m_next);
+        // Q_EMIT conversationSwitchRequested(m_next)
+        QMetaObject::invokeMethod(this, "conversationSwitchRequested", Qt::QueuedConnection,
+            Q_ARG(QDate, m_next));
         return;
     }
 
     if (link.fragment() == QLatin1String("x-prevConversation")) {
-        Q_EMIT conversationSwitchRequested(m_prev);
+        // Q_EMIT conversationSwitchRequested(m_prev)
+        QMetaObject::invokeMethod(this, "conversationSwitchRequested", Qt::QueuedConnection,
+            Q_ARG(QDate, m_prev));
         return;
     }
 

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list