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

The following commit has been merged in the master branch:
commit d73c5b9c6716192b7030db613f6882198fc7df30
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Tue Aug 19 21:50:55 2014 +0200

    Documented onOtrStatusChanged method behavior
---
 app/chat-window.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 02040a2..fa8e561 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -945,6 +945,7 @@ void ChatWindow::onOtrStatusChanged(OtrStatus status)
 {
 
     ChatWidget *chatTab = dynamic_cast<ChatWidget*>(QObject::sender());
+    // in case if this slot is called directly, not by the signal
     if(!chatTab) {
         chatTab = getCurrentTab();
     }
@@ -953,6 +954,7 @@ void ChatWindow::onOtrStatusChanged(OtrStatus status)
         return;
     }
 
+    // OTR is disabled for this channel
     if(!status) {
         m_otrActionMenu->setEnabled(false);
         m_otrActionMenu->menu()->setIcon(KIcon(QLatin1String("object-unlocked")));

-- 
ktp-text-ui packaging