[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=80a0a39

The following commit has been merged in the master branch:
commit 80a0a39dadd805d8cca0159bdf207687ea655ce1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Sep 27 11:02:17 2010 +0000

    Updated config tool to use the new AdiumTheme structures.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1180205
---
 config/mainwindow.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index d81c853..3a549b9 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -3,7 +3,8 @@
 #include "chatwindowstylemanager.h"
 
 #include "adiumthemeheaderinfo.h"
-#include "telepathychatmessageinfo.h"
+#include "adiumthemecontentinfo.h"
+#include "adiumthemestatusinfo.h"
 
 #include <QDebug>
 #include <KDebug>
@@ -122,26 +123,28 @@ void MainWindow::sendDemoMessages()
 {
     //add a fake message
 
-    TelepathyChatMessageInfo message(TelepathyChatMessageInfo::RemoteToLocal);
+    AdiumThemeContentInfo message(AdiumThemeMessageInfo::RemoteToLocal);
     message.setMessage("Hello");
     message.setSenderDisplayName("larry at example.com");
     message.setSenderScreenName("Larry Demo");
     message.setService("Jabber");
     message.setTime(QDateTime::currentDateTime());
-    ui->chatView->addMessage(message);
+    ui->chatView->addContentMessage(message);
 
-    message = TelepathyChatMessageInfo(TelepathyChatMessageInfo::LocalToRemote);
+    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::LocalToRemote);
     message.setMessage("A different example message");
     message.setSenderDisplayName("ted at example.com");
     message.setSenderScreenName("Ted Example");
     message.setService("Jabber");
     message.setTime(QDateTime::currentDateTime());
-    ui->chatView->addMessage(message);
-
-    message = TelepathyChatMessageInfo(TelepathyChatMessageInfo::Status);
-    message.setMessage("Ted Example has left the chat."); //FIXME sync this with chat text logic.
-    message.setTime(QDateTime::currentDateTime());
-    ui->chatView->addMessage(message);
+    ui->chatView->addContentMessage(message);
+
+    AdiumThemeStatusInfo  statusMessage;
+    statusMessage.setMessage("Ted Example has left the chat."); //FIXME sync this with chat text logic.
+    statusMessage.setTime(QDateTime::currentDateTime());
+    statusMessage.setService("Jabber");
+    statusMessage.setStatus("away");
+    ui->chatView->addStatusMessage(statusMessage);
 }
 
 void MainWindow::accept()

-- 
ktp-text-ui packaging