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

The following commit has been merged in the master branch:
commit a97641e742d3088b63e050914af34fc8e15a0b75
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Sep 25 17:50:20 2010 +0000

    Chat Window updated to use new addContentMessage, addStatusMessage
    calls.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1179509
---
 lib/adiumthemeview.cpp     |  3 ---
 lib/channelcontactlist.cpp |  2 --
 lib/chatwindow.cpp         | 21 ++++++++++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/adiumthemeview.cpp b/lib/adiumthemeview.cpp
index c049955..2403f9d 100644
--- a/lib/adiumthemeview.cpp
+++ b/lib/adiumthemeview.cpp
@@ -180,8 +180,6 @@ void AdiumThemeView::setChatStyle(ChatWindowStyle *chatStyle)
         m_variantPath = "";
         m_variantName = "";
     }
-
-
     initialise(m_chatInfo);
 }
 
@@ -259,7 +257,6 @@ void AdiumThemeView::addMessage(const TelepathyChatMessageInfo &message)
         m_lastSender = message.senderScreenName();
     }
 
-
     switch (message.type()) {
     case TelepathyChatMessageInfo::RemoteToLocal:
         if (consecutiveMessage) {
diff --git a/lib/channelcontactlist.cpp b/lib/channelcontactlist.cpp
index b1eaddd..0188324 100644
--- a/lib/channelcontactlist.cpp
+++ b/lib/channelcontactlist.cpp
@@ -16,8 +16,6 @@ other sets (taking set union of them is easiest)
  */
 
 
-
-
 ChannelContactListContact::ChannelContactListContact(Tp::ContactPtr contact, QObject *parent)
         : QObject(parent)
 {
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index f4ff262..1bece77 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -21,6 +21,11 @@
 #include "ui_chatwindow.h"
 #include "telepathychatmessageinfo.h"
 #include "adiumthemeheaderinfo.h"
+#include "adiumthemecontentinfo.h"
+#include "adiumthememessageinfo.h"
+#include "adiumthemestatusinfo.h"
+
+
 #include "channelcontactlist.h"
 
 #include <QKeyEvent>
@@ -118,7 +123,7 @@ QString ChatWindow::title()
 void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
 {
     if (m_chatviewlInitialised) {
-        TelepathyChatMessageInfo messageInfo(TelepathyChatMessageInfo::RemoteToLocal);
+        AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
 
         //debug the message parts (looking for HTML etc)
 //        foreach(Tp::MessagePart part, message.parts())
@@ -130,13 +135,12 @@ void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
 //            }
 //        }
 
-
         messageInfo.setMessage(message.text());
         messageInfo.setTime(message.received());
         messageInfo.setSenderDisplayName(message.sender()->alias());
         messageInfo.setSenderScreenName(message.sender()->id());
 
-        ui->chatArea->addMessage(messageInfo);
+        ui->chatArea->addContentMessage(messageInfo);
         m_chatConnection->channel()->acknowledge(QList<Tp::ReceivedMessage>() << message);
 
         emit messageReceived();
@@ -147,7 +151,7 @@ void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
 
 void ChatWindow::handleMessageSent(const Tp::Message &message, Tp::MessageSendingFlags, const QString&) /*Not sure what these other args are for*/
 {
-    TelepathyChatMessageInfo messageInfo(TelepathyChatMessageInfo::LocalToRemote);
+    AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
     messageInfo.setMessage(message.text());
     messageInfo.setTime(message.sent());
 
@@ -155,7 +159,7 @@ void ChatWindow::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
     messageInfo.setSenderDisplayName(sender->alias());
     messageInfo.setSenderScreenName(sender->id());
 
-    ui->chatArea->addMessage(messageInfo);
+    ui->chatArea->addContentMessage(messageInfo);
 }
 
 void ChatWindow::chatViewReady()
@@ -187,9 +191,12 @@ void ChatWindow::updateChatStatus(Tp::ContactPtr contact, ChannelChatState state
 
     switch (state) {
     case ChannelChatStateGone: {
-        TelepathyChatMessageInfo statusMessage(TelepathyChatMessageInfo::Status);
+        AdiumThemeStatusInfo statusMessage;
         statusMessage.setMessage(i18n("%1 has left the chat").arg(contact->alias()));
-        ui->chatArea->addMessage(statusMessage);
+        statusMessage.setService("");
+        statusMessage.setStatus("away");
+        statusMessage.setTime(QDateTime::currentDateTime());
+        ui->chatArea->addStatusMessage(statusMessage);
     }
     break;
     case ChannelChatStateInactive:

-- 
ktp-text-ui packaging