[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=700a410

The following commit has been merged in the master branch:
commit 700a410fd23e320e21f7989ac2f9d0e41d15aea8
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jun 25 20:26:06 2011 +1000

    Added a new signal to relay PgUp and PgDown events from ChatTextEdit to AdiumThemeView
---
 app/chat-window.cpp | 28 ++++++++++------------------
 lib/chat-widget.cpp |  5 -----
 lib/chat-widget.h   |  7 ++-----
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 517b694..6cb7395 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -196,24 +196,16 @@ void ChatWindow::onCurrentIndexChanged(int index)
         onEnableSearchActions(true);
     }
 
-    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);
-    }
+    // 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);
 }
 
 void ChatWindow::onEnableSearchActions(bool enable)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 89e8c97..b12162d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -288,11 +288,6 @@ 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 06e98a1..0255beb 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -48,14 +48,11 @@ 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 wether the chat is considered a group chat */
-    bool isGroupChat() const;
+    /** Returns a pointer to the Chatwidget's search bar */
+    ChatSearchBar *chatSearchBar() const;
 
     /** invalidates the use of the chat.
      * @param enable flag to validate/invalidate chatWidget

-- 
ktp-text-ui packaging