[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-common-internals/mklapetek/SpaceBar] KTp/Declarative: [declarative] Directly request closing th
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-10 21:32:50
Message-ID: E1ae8CQ-00073k-9q () scm ! kde ! org
[Download RAW message or body]

Git commit ee576bd44053bec4734928dd65642b4fc1c4fe6f by Martin Klapetek.
Committed on 10/03/2016 at 21:31.
Pushed by mklapetek into branch 'mklapetek/SpaceBar'.

[declarative] Directly request closing the channel in requestClose()

M  +3    -2    KTp/Declarative/conversation.cpp

http://commits.kde.org/telepathy-common-internals/ee576bd44053bec4734928dd6=
5642b4fc1c4fe6f

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversatio=
n.cpp
index cb2aa66..4773171 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -259,8 +259,9 @@ void Conversation::requestClose()
 {
     qCDebug(KTP_DECLARATIVE);
 =

-    //removing from the model will delete this object closing the channel
-    Q_EMIT conversationCloseRequested();
+    if (!d->messages->textChannel().isNull()) {
+        d->messages->textChannel()->requestClose();
+    }
 }
 =

 void Conversation::updateTextChanged(const QString &message)

[prev in list] [next in list] [prev in thread] [next in thread]