[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=33cb2aa

The following commit has been merged in the master branch:
commit 33cb2aab9b0dea157d14d8b34c82ea9187721e1a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Dec 9 23:01:06 2010 +0000

    Updated to use ChannelClassSpecList classes for the client handler channel filter
---
 app/mainwindow.cpp | 25 +++++++------------------
 app/mainwindow.h   |  2 +-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 321ecd8..fe5717f 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -25,29 +25,17 @@
 #include <TelepathyQt4/ChannelClassSpecList>
 
 
-inline ChannelClassList channelClassList()
+inline ChannelClassSpecList channelClassList()
 {
-    ChannelClassList filters;
-    QMap<QString, QDBusVariant> filter;
-    filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
-                  QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
-    filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
-                  QDBusVariant((uint) Tp::HandleTypeContact));
-    filters.append(filter);
-
-    filter.clear();
-    filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
-                  QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
-    filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
-                  QDBusVariant((uint) Tp::HandleTypeRoom));
-    filters.append(filter);
-    return filters;
-}
+    return ChannelClassSpecList() << ChannelClassSpec::textChat()
+                                  << ChannelClassSpec::unnamedTextChat()
+                                  << ChannelClassSpec::textChatroom();
+}	
 
 
 MainWindow::MainWindow() :
         KTabWidget(),
-        AbstractClientHandler(ChannelClassSpecList())
+        AbstractClientHandler(channelClassList())
 {
     setTabReorderingEnabled(true);
     connect(this, SIGNAL(currentChanged(int)), SLOT(onCurrentIndexChanged(int)));
@@ -61,6 +49,7 @@ void MainWindow::handleChannels(const MethodInvocationContextPtr<> &context,
         const QDateTime &userActionTime,
         const AbstractClientHandler::HandlerInfo &handlerInfo)
 {
+
     ChatConnection* chatConnection = new ChatConnection(this, account, connection, channels);
     ChatWindow* newWindow = new ChatWindow(chatConnection, this);
 
diff --git a/app/mainwindow.h b/app/mainwindow.h
index fcb0556..acad10d 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -33,7 +33,7 @@
 
 using namespace Tp;
 
-inline ChannelClassList channelClassList();
+inline ChannelClassSpecList channelClassList();
 
 //In the future I want to have a (potential) list of tab widgets. Like Kopete presently. This may need a bit of a rewrite.
 

-- 
ktp-text-ui packaging