[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=849876f

The following commit has been merged in the master branch:
commit 849876f15ed82c0a94c5625c7ff085bb494dbdb3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Aug 29 21:34:21 2011 +0100

    Adds a hint to the chat window which it uses to forceActivate that window.
    
    REVIEW: 102589
    Review by: Martin Klapetek
---
 main-widget.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 0f9142a..dd7e24b 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -537,9 +537,13 @@ void MainWidget::startTextChannel(ContactModelItem *contactItem)
 
     Tp::AccountPtr account = m_model->accountForContactItem(contactItem);
 
+    Tp::ChannelRequestHints hints;
+    hints.setHint("org.kde.telepathy","forceRaiseWindow", QVariant(true));
+
     Tp::PendingChannelRequest* channelRequest = account->ensureTextChat(contact,
                                                                         QDateTime::currentDateTime(),
-                                                                        PREFERRED_TEXTCHAT_HANDLER);
+                                                                        PREFERRED_TEXTCHAT_HANDLER,
+                                                                        hints);
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)),
             this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }

-- 
ktp-contact-list packaging