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

The following commit has been merged in the master branch:
commit c6a41811dfb5e0162bcc3f71f35b3e06a74490ab
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Fri Jun 20 13:27:23 2014 +0200

    OTR session is finished on tab destruction.
---
 app/chat-window.cpp | 12 ++++++++----
 lib/chat-widget.cpp |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 485b09a..756ea4f 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -888,7 +888,8 @@ void ChatWindow::setupCustomActions()
 }
 
 
-void ChatWindow::setupOtrActions() {
+void ChatWindow::setupOtrActions() 
+{
 
     otrActionMenu = new KActionMenu(KIcon(QLatin1String("object-unlocked")), i18n("&OTR"), this);
     otrActionMenu->setDelayed(false);
@@ -916,7 +917,8 @@ void ChatWindow::setupOtrActions() {
     actionCollection()->addAction(QLatin1String("otr-actions"), otrActionMenu);
 }
 
-void ChatWindow::onOtrStatusChanged(OtrStatus status, ChatWidget *chatTab) {
+void ChatWindow::onOtrStatusChanged(OtrStatus status, ChatWidget *chatTab) 
+{
 
     if(chatTab != getCurrentTab()) return;
 
@@ -970,7 +972,8 @@ void ChatWindow::onOtrStatusChanged(OtrStatus status, ChatWidget *chatTab) {
     }
 }
 
-void ChatWindow::onStartRestartOtrTriggered() {
+void ChatWindow::onStartRestartOtrTriggered() 
+{
 
     ChatTab* chat = getCurrentTab();
     chat->startOtrSession();
@@ -982,7 +985,8 @@ void ChatWindow::onStopOtrTriggered() {
     chat->stopOtrSession();
 }
 
-void ChatWindow::onAuthenticateBuddyTriggered() {
+void ChatWindow::onAuthenticateBuddyTriggered() 
+{
 
     ChatTab* chat = getCurrentTab();
     chat->authenticateBuddy();
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 374359e..eac802b 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -266,6 +266,9 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
 ChatWidget::~ChatWidget()
 {
     saveSpellCheckingOption();
+    if(d->otrStatus && (d->otrStatus.otrTrustLevel() != Tp::OTRTrustLevelNotPrivate)) {
+        stopOtrSession();
+    }
     delete d;
 }
 

-- 
ktp-text-ui packaging