[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=b192762

The following commit has been merged in the master branch:
commit b192762c3720e1f26a10248e0c3eecf08e1776e2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Mar 19 02:54:34 2013 +0000

    Show context menu for new contact requests on left click
    
    BUG: 298009
    REVIEW: 109577
---
 contact-request-handler.cpp | 11 +++++++++++
 contact-request-handler.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index fa422d1..65c5c9b 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -213,6 +213,15 @@ void ContactRequestHandler::onContactInvalidated()
     updateMenus();
 }
 
+void ContactRequestHandler::onNotifierActivated(bool active, const QPoint &pos)
+{
+    if (active) {
+        if (m_notifierItem) {
+            m_notifierItem.data()->contextMenu()->popup(pos);
+        }
+    }
+}
+
 void ContactRequestHandler::onContactRequestApproved()
 {
     QString contactId = qobject_cast<KAction*>(sender())->data().toString();
@@ -358,6 +367,8 @@ void ContactRequestHandler::updateMenus()
         KMenu *notifierMenu = new KMenu(0);
         notifierMenu->addTitle(i18nc("Context menu title", "Received contact requests"));
 
+        connect(m_notifierItem.data(), SIGNAL(activateRequested(bool,QPoint)), SLOT(onNotifierActivated(bool,QPoint)));
+
         m_notifierItem.data()->setContextMenu(notifierMenu);
     }
 
diff --git a/contact-request-handler.h b/contact-request-handler.h
index 649bd51..0042294 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -49,6 +49,8 @@ private Q_SLOTS:
     void onFinalizeSubscriptionFinished(Tp::PendingOperation*);
     void onContactInvalidated();
 
+    void onNotifierActivated(bool active, const QPoint &pos);
+
 private:
     void updateMenus();
     void handleNewConnection(const Tp::ConnectionPtr &connection);

-- 
ktp-kded-integration-module packaging