[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=351794a

The following commit has been merged in the master branch:
commit 351794a556da94c34cc491361abd57e2bb31c6eb
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Fri Feb 24 15:19:37 2012 +0200

    Use Channel::groupSelfContact() instead of Connection::selfContact() in the chat widget.
    
    Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes at collabora.co.uk>
---
 lib/chat-widget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 1e54b2d..c6233bb 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -583,7 +583,7 @@ void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
         return;
     }
     // don't notify of messages sent by self from another computer
-    if (message.sender() == d->channel->connection()->selfContact()) {
+    if (message.sender() == d->channel->groupSelfContact()) {
         return;
     }
     // kde_telepathy_contact_highlight (contains your name)
@@ -591,7 +591,7 @@ void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
 
     //if the message text contains sender name, it's a "highlighted message"
     //TODO DrDanz suggested this could be a configurable list of words that make it highlighted.(seems like a good idea to me)
-    if(message.text().contains(d->channel->connection()->selfContact()->alias())) {
+    if(message.text().contains(d->channel->groupSelfContact()->alias())) {
         notificationType = QLatin1String("kde_telepathy_contact_highlight");
     } else if(message.messageType() == Tp::ChannelTextMessageTypeNotice) {
         notificationType = QLatin1String("kde_telepathy_info_event");
@@ -628,7 +628,7 @@ void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
 
 void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendingFlags, const QString&) /*Not sure what these other args are for*/
 {
-    Tp::ContactPtr sender = d->channel->connection()->selfContact();
+    Tp::ContactPtr sender = d->channel->groupSelfContact();
 
     if (message.messageType() == Tp::ChannelTextMessageTypeAction) {
         AdiumThemeStatusInfo statusMessage;
@@ -686,7 +686,7 @@ void ChatWidget::sendMessage()
 void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::ChannelChatState state)
 {
     //don't show our own status changes.
-    if (contact == d->channel->connection()->selfContact()) {
+    if (contact == d->channel->groupSelfContact()) {
         return;
     }
 
@@ -720,7 +720,7 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
         //In a multiperson chat just because this user is no longer typing it doesn't mean that no-one is.
         //loop through each contact, check no-one is in composing mode.
         Q_FOREACH (const Tp::ContactPtr & contact, d->channel->groupContacts()) {
-            if (contact == d->channel->connection()->selfContact()) {
+            if (contact == d->channel->groupSelfContact()) {
                 continue;
             }
 

-- 
ktp-text-ui packaging