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

The following commit has been merged in the master branch:
commit 535258382980ea44b8c18323015188549293cf4f
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Fri Jun 24 20:49:55 2011 +0200

    FIX crash when creating group chats
    
    Reviewed By: David Edmundson
---
 app/chat-window.cpp | 28 ++++++++++++++++++----------
 lib/chat-widget.cpp |  5 +++++
 lib/chat-widget.h   |  7 +++++--
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 43c9d47..0e6094a 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -204,16 +204,24 @@ void ChatWindow::onCurrentIndexChanged(int index)
         onEnableSearchActions(true);
     }
 
-    // check which capabilities the contact and user supports
-    Tp::ContactCapabilities contactCapabilites = currentChatTab->textChannel()->targetContact()->capabilities();
-    Tp::ContactCapabilities selfCapabilities = currentChatTab->account()->connection()->selfContact()->capabilities();
-
-    setAudioCallEnabled(selfCapabilities.streamedMediaAudioCalls() && contactCapabilites.streamedMediaAudioCalls());
-    setFileTransferEnabled(selfCapabilities.fileTransfers() && contactCapabilites.fileTransfers());
-    setVideoCallEnabled(selfCapabilities.streamedMediaVideoCalls() && contactCapabilites.streamedMediaVideoCalls());
-
-    /// TODO re-activate check when invitation to chat has been sorted out
-    setInviteToChatEnabled(false);
+    if (!currentChatTab->isGroupChat()) {
+        // check which capabilities the contact and user supports
+        Tp::ContactCapabilities contactCapabilites = currentChatTab->textChannel()->targetContact()->capabilities();
+        Tp::ContactCapabilities selfCapabilities = currentChatTab->account()->connection()->selfContact()->capabilities();
+
+        setAudioCallEnabled(selfCapabilities.streamedMediaAudioCalls() && contactCapabilites.streamedMediaAudioCalls());
+        setFileTransferEnabled(selfCapabilities.fileTransfers() && contactCapabilites.fileTransfers());
+        setVideoCallEnabled(selfCapabilities.streamedMediaVideoCalls() && contactCapabilites.streamedMediaVideoCalls());
+        /// 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);
+        /// TODO re-activate check when invitation to chat has been sorted out
+        setInviteToChatEnabled(false);
+    }
 }
 
 void ChatWindow::onEnableSearchActions(bool enable)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index b12162d..89e8c97 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -288,6 +288,11 @@ KIcon ChatWidget::icon() const
     }
 }
 
+bool ChatWidget::isGroupChat() const
+{
+    return d->isGroupChat;
+}
+
 ChatSearchBar* ChatWidget::chatSearchBar() const
 {
     return d->ui.searchBar;
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 0255beb..06e98a1 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -48,11 +48,14 @@ public:
     /** Returns pointer to account used for chat */
     Tp::AccountPtr account() const;
 
+    /** Returns a pointer to the Chatwidget's search bar */
+    ChatSearchBar *chatSearchBar() const;
+
     /** Returns the icon of this chat window */
     KIcon icon() const;
 
-    /** Returns a pointer to the Chatwidget's search bar */
-    ChatSearchBar *chatSearchBar() const;
+    /** returns wether the chat is considered a group chat */
+    bool isGroupChat() const;
 
     /** invalidates the use of the chat.
      * @param enable flag to validate/invalidate chatWidget

-- 
ktp-text-ui packaging