[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=3b91e95

The following commit has been merged in the master branch:
commit 3b91e956ac04a6830837f8464570bb2e9be2f95b
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Tue Aug 19 16:43:24 2014 +0200

    ChatWidget: newOTRstatus to hasNewOTRstatus
---
 lib/chat-widget.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index a3da640..d021adb 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -88,7 +88,7 @@ public:
         messageWidgetSwitchOnlineAction(0),
         logsLoaded(false),
         exchangedMessagesCount(0),
-        newOTRstatus(false)
+        hasNewOTRstatus(false)
     {
     }
     /** Stores whether the channel is ready with all contacts upgraded*/
@@ -115,7 +115,7 @@ public:
     QTimer *pausedStateTimer;
     bool logsLoaded;
     uint exchangedMessagesCount;
-    bool newOTRstatus;
+    bool hasNewOTRstatus;
 
     QList< Tp::OutgoingFileTransferChannelPtr > tmpFileTransfers;
 
@@ -629,7 +629,7 @@ void ChatWidget::onHistoryFetched(const QList<KTp::Message> &messages)
 
 int ChatWidget::unreadMessageCount() const
 {
-    return d->channel->messageQueue().size() + (d->newOTRstatus ? 1 : 0);
+    return d->channel->messageQueue().size() + (d->hasNewOTRstatus ? 1 : 0);
 }
 
 void ChatWidget::acknowledgeMessages()
@@ -640,8 +640,8 @@ void ChatWidget::acknowledgeMessages()
         //acknowledge everything in the message queue.
         d->channel->acknowledge(d->channel->messageQueue());
     }
-    if(d->newOTRstatus) {
-        d->newOTRstatus = false;
+    if(d->hasNewOTRstatus) {
+        d->hasNewOTRstatus = false;
         Q_EMIT unreadMessagesChanged();
     }
 }
@@ -740,7 +740,7 @@ void ChatWidget::onOTRTrustLevelChanged(Tp::OTRTrustLevel trustLevel, Tp::OTRTru
         return;
     }
 
-    d->newOTRstatus = true;
+    d->hasNewOTRstatus = true;
     switch(trustLevel) {
         case Tp::OTRTrustLevelUnverified:
             if(previous == Tp::OTRTrustLevelPrivate) {

-- 
ktp-text-ui packaging