[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=97b673c

The following commit has been merged in the master branch:
commit 97b673cb898917e7cddeb0adcc1bce919e6cefd5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed May 15 15:13:09 2013 +0200

    Add 'Contact Details' action to incomming contact request menu
    
    BUG: 298764
    FIXED-IN: 0.7.0
    REVIEW: 110445
---
 contact-request-handler.cpp | 28 ++++++++++++++++++++++++++++
 contact-request-handler.h   |  1 +
 2 files changed, 29 insertions(+)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index e30d2ca..014b9cb 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -28,6 +28,7 @@
 #include <TelepathyQt/Account>
 
 #include <KTp/error-dictionary.h>
+#include <KTp/contact-info-dialog.h>
 
 #include <QtCore/QFutureWatcher>
 
@@ -255,6 +256,24 @@ void ContactRequestHandler::onContactRequestApproved()
 
 }
 
+void ContactRequestHandler::onShowContactDetails()
+{
+    QString contactId = qobject_cast<KAction*>(sender())->data().toString();
+
+    if (!contactId.isEmpty()) {
+        const Tp::ContactPtr contact = m_pendingContacts.find(contactId).value();
+        const Tp::ContactManagerPtr manager = contact->manager();
+        Q_FOREACH (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
+            if (account->connection() == manager->connection()) {
+                KTp::ContactInfoDialog *dialog = new KTp::ContactInfoDialog(account, contact);
+                connect(dialog, SIGNAL(closeClicked()), dialog, SLOT(deleteLater()));
+                dialog->show();
+                break;
+            }
+        }
+    }
+}
+
 void ContactRequestHandler::onAuthorizePresencePublicationFinished(Tp::PendingOperation *op)
 {
     Tp::ContactPtr contact = op->property("__contact").value< Tp::ContactPtr >();
@@ -395,6 +414,15 @@ void ContactRequestHandler::updateMenus()
         } else {
             contactMenu->addTitle(contact->alias());
         }
+
+        menuAction = new KAction(KIcon(QLatin1String("user-identity")), i18n("Contact Details"), contactMenu);
+        menuAction->setData(i.key());
+        connect(menuAction, SIGNAL(triggered()),
+                this, SLOT(onShowContactDetails()));
+        contactMenu->addAction(menuAction);
+
+        contactMenu->addSeparator();
+
         menuAction = new KAction(KIcon(QLatin1String("dialog-ok-apply")), i18n("Approve"), contactMenu);
         menuAction->setData(i.key());
         connect(menuAction, SIGNAL(triggered()),
diff --git a/contact-request-handler.h b/contact-request-handler.h
index 0042294..69d2a1e 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -44,6 +44,7 @@ private Q_SLOTS:
 
     void onContactRequestApproved();
     void onContactRequestDenied();
+    void onShowContactDetails();
     void onAuthorizePresencePublicationFinished(Tp::PendingOperation*);
     void onRemovePresencePublicationFinished(Tp::PendingOperation*);
     void onFinalizeSubscriptionFinished(Tp::PendingOperation*);

-- 
ktp-kded-integration-module packaging