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

The following commit has been merged in the master branch:
commit d1fb2268c642022999b0f78e11c5d84470fc987a
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Thu Aug 28 00:49:17 2014 +0200

    Fix OTR session status messages
---
 lib/chat-widget.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 500d19b..dc6f0ec 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -757,15 +757,11 @@ void ChatWidget::onOTRTrustLevelChanged(KTp::OTRTrustLevel trustLevel, KTp::OTRT
 {
     kDebug();
 
-    if(trustLevel == previous) {
-        return;
-    }
-
     d->hasNewOTRstatus = true;
     switch(trustLevel) {
         case KTp::OTRTrustLevelUnverified:
             if(previous == KTp::OTRTrustLevelPrivate) {
-                d->ui.chatArea->addStatusMessage(i18n("The OTR session is unverified now"));
+                d->ui.chatArea->addStatusMessage(i18n("The OTR session is now unverified"));
             }
             else {
                 d->ui.chatArea->addStatusMessage(i18n("Unverified OTR session started"));
@@ -776,7 +772,7 @@ void ChatWidget::onOTRTrustLevelChanged(KTp::OTRTrustLevel trustLevel, KTp::OTRT
             break;
         case KTp::OTRTrustLevelPrivate:
             if(previous == KTp::OTRTrustLevelUnverified) {
-                d->ui.chatArea->addStatusMessage(i18n("The OTR session is private now"));
+                d->ui.chatArea->addStatusMessage(i18n("The OTR session is now private"));
             }
             else {
                 d->ui.chatArea->addStatusMessage(i18n("Private OTR session started"));
@@ -801,7 +797,9 @@ void ChatWidget::onOTRTrustLevelChanged(KTp::OTRTrustLevel trustLevel, KTp::OTRT
 
 void ChatWidget::onOTRsessionRefreshed()
 {
-    d->ui.chatArea->addStatusMessage(i18n("Successfully refreshed OTR session"));
+    const QLatin1String status = (d->channel->otrTrustLevel() == KTp::OTRTrustLevelPrivate) ?
+        QLatin1String("private") : QLatin1String("unverified");
+    d->ui.chatArea->addStatusMessage(i18n("Successfully refreshed %1 OTR session", status));
 }
 
 void ChatWidget::onPeerAuthenticationRequestedQA(const QString &question)

-- 
ktp-text-ui packaging