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

The following commit has been merged in the master branch:
commit b17b051964f19c161aa15e35d5e8a1f2cd335ad2
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Wed Aug 6 15:09:20 2014 +0200

    Stop OTR session on tab close
---
 app/chat-window.cpp     | 4 +++-
 lib/channel-adapter.cpp | 2 +-
 lib/chat-widget.cpp     | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 142a505..849238f 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -245,6 +245,7 @@ void ChatWindow::removeTab(ChatTab *tab)
 {
     kDebug();
 
+    tab->stopOtrSession();
     removeChatTabSignals(tab);
 
     m_tabWidget->removePage(tab);
@@ -762,7 +763,7 @@ void ChatWindow::removeChatTabSignals(ChatTab *chatTab)
     disconnect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(onTabTextChanged(QString)));
     disconnect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(onTabIconChanged(KIcon)));
     disconnect(chatTab, SIGNAL(unreadMessagesChanged()), this, SLOT(onTabStateChanged()));
-    disconnect(chatTab, SIGNAL(contactPresenceChanged(Tp::Presence)), this, SLOT(onTabStateChanged()));
+    disconnect(chatTab, SIGNAL(contactPresenceChanged(KTp::Presence)), this, SLOT(onTabStateChanged()));
     disconnect(chatTab->chatSearchBar(), SIGNAL(enableSearchButtonsSignal(bool)), this, SLOT(onEnableSearchActions(bool)));
     disconnect(chatTab, SIGNAL(contactBlockStatusChanged(bool)), this, SLOT(toggleBlockButton(bool)));
     if(chatTab->otrStatus())
@@ -1324,6 +1325,7 @@ void ChatWindow::onReloadTheme()
 void ChatWindow::onLeaveChannelTriggered()
 {
     ChatTab *tab = getCurrentTab();
+    tab->stopOtrSession();
     tab->textChannel()->requestLeave();
     closeCurrentTab();
 }
diff --git a/lib/channel-adapter.cpp b/lib/channel-adapter.cpp
index 6863c55..502284d 100644
--- a/lib/channel-adapter.cpp
+++ b/lib/channel-adapter.cpp
@@ -237,7 +237,7 @@ void ChannelAdapter::initializeOTR()
 
 void ChannelAdapter::stopOTR()
 {
-    kDebug() << "Stopping OTR session";
+    kDebug();
     d->otrProxy->Stop();
 }
 
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 7a57dd4..bb9bd00 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -681,7 +681,10 @@ void ChatWidget::startOtrSession()
 
 void ChatWidget::stopOtrSession()
 {
-    if(!d->channel.isOTRsuppored()) return;
+    kDebug();
+    if(!d->channel.isOTRsuppored() || d->channel.otrTrustLevel() == Tp::OTRTrustLevelNotPrivate) {
+        return;
+    }
     d->channel.stopOTR();
     d->ui.chatArea->addStatusMessage(i18n("Terminating OTR session"));
 }

-- 
ktp-text-ui packaging