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

The following commit has been merged in the master branch:
commit d916f30814194d62abdd0a18fe4fd5614401c10f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jul 25 13:22:18 2011 +0100

    Fix crash when switching tabs to an offline account
    Reviewed by: Francesco Nwokeka
---
 app/chat-window.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 2abe11f..9f37beb 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -259,10 +259,12 @@ void ChatWindow::onCurrentIndexChanged(int index)
         onEnableSearchActions(true);
     }
 
-    if (!currentChatTab->isGroupChat()) {
+    //enable/disable  send file/start webcam buttons
+    //always disabled for group chats and offline accounts.
+    if (!currentChatTab->isGroupChat() && currentChatTab->account()->connection()) {
         // check which capabilities the contact and user supports
         Tp::ContactCapabilities contactCapabilites = currentChatTab->textChannel()->targetContact()->capabilities();
-        Tp::ContactCapabilities selfCapabilities = currentChatTab->account()->connection()->selfContact()->capabilities();
+        Tp::ContactCapabilities selfCapabilities = currentChatTab->textChannel()->groupSelfContact()->capabilities();
 
         setAudioCallEnabled(selfCapabilities.streamedMediaAudioCalls() && contactCapabilites.streamedMediaAudioCalls());
         setFileTransferEnabled(selfCapabilities.fileTransfers() && contactCapabilites.fileTransfers());
@@ -270,7 +272,6 @@ void ChatWindow::onCurrentIndexChanged(int index)
         /// TODO re-activate check when invitation to chat has been sorted out
         setInviteToChatEnabled(false);
     } else {
-        // group chats don't have these functions
         setAudioCallEnabled(false);
         setFileTransferEnabled(false);
         setVideoCallEnabled(false);

-- 
ktp-text-ui packaging