[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=9ae07a0

The following commit has been merged in the master branch:
commit 9ae07a02f391ecd4449b370c2b08f2b29b89a8eb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 16 14:06:18 2011 +0100

    Send channel hints on group channels
---
 main-widget.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 868085c..98abf29 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -1313,9 +1313,14 @@ void MainWidget::onJoinChatRoomRequested()
         // check account validity. Should NEVER be invalid
         if (!account.isNull()) {
             // ensure chat room
+            Tp::ChannelRequestHints hints;
+            hints.setHint("org.kde.telepathy","forceRaiseWindow", QVariant(true));
+
             Tp::PendingChannelRequest *channelRequest = account->ensureTextChatroom(dialog.data()->selectedChatRoom(),
                                                                                     QDateTime::currentDateTime(),
-                                                                                    PREFERRED_TEXTCHAT_HANDLER);
+                                                                                    PREFERRED_TEXTCHAT_HANDLER,
+                                                                                    hints);
+
             connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
         }
     }

-- 
ktp-contact-list packaging