[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=475aa2a

The following commit has been merged in the master branch:
commit 475aa2ac7c74dbf90f5ce52fecdb3ed8e4f5dc8f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jun 25 01:49:25 2011 +0100

    Set preferred text handler when starting TextChatRoom
---
 main-widget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 253006d..28c2d9a 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -1231,7 +1231,9 @@ void MainWidget::onJoinChatRoomRequested()
         // check account validity. Should NEVER be invalid
         if (!account.isNull()) {
             // ensure chat room
-            Tp::PendingChannelRequest *channelRequest = account->ensureTextChatroom(dialog.data()->selectedChatRoom());
+            Tp::PendingChannelRequest *channelRequest = account->ensureTextChatroom(dialog.data()->selectedChatRoom(),
+                                                                                    QDateTime::currentDateTime(),
+                                                                                    PREFERRED_TEXTCHAT_HANDLER);
             connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(slotGenericOperationFinished(Tp::PendingOperation*)));
         }
     }

-- 
ktp-contact-list packaging