[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=8131e68

The following commit has been merged in the master branch:
commit 8131e68532d74aba3d82c75d087566797e2bb891
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Oct 4 19:05:12 2012 +0200

    Call the onContactPresenceChange directly without connection checks
    
    The connection status at this point is still Tp::ConnectionStatusDisconnected
    and so the check for connection being Tp::ConnectionStatusConnected
    would never pass, which leads to not printing the "You are now marked
    as Available" line when reconnecting, leaving the "You are now offline"
    as the last message in the chat.
    
    The contact presence at this point is already correct, so we can
    just bypass checking the connection and call it directly.
    
    Reviewed-by: David Edmundson
    BUG: 307827
    FIXED-IN: 0.5.1
---
 lib/chat-widget.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 1a148c1..7827557 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -296,9 +296,8 @@ void ChatWidget::setChatEnabled(bool enable)
 
 void ChatWidget::setTextChannel(const Tp::TextChannelPtr &newTextChannelPtr)
 {
-    if (!d->channel.isNull() && d->channel->connection()->status() == Tp::ConnectionStatusConnected) {
-        onContactPresenceChange(d->channel->groupSelfContact(), KTp::Presence(d->channel->groupSelfContact()->presence()));
-    }
+    onContactPresenceChange(d->channel->groupSelfContact(), KTp::Presence(d->channel->groupSelfContact()->presence()));
+
     d->channel = newTextChannelPtr;     // set the new channel
     d->contactModel->setTextChannel(newTextChannelPtr);
 

-- 
ktp-text-ui packaging