[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=a5591bb

The following commit has been merged in the master branch:
commit a5591bbc20dfecbe907bdc5fb5bebb5f9ce11c0c
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Tue Sep 25 00:27:31 2012 +0530

    Use the brand new subclassed Notification dialog from
    ktp-common-internals
    
    REVIEW: 106353
---
 context-menu.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index 9201a0d..10711c9 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -37,6 +37,7 @@
 #include <KTp/Models/groups-model-item.h>
 #include <KTp/Models/groups-model.h>
 #include <KTp/text-parser.h>
+#include <KTp/Widgets/notificationconfigdialog.h>
 
 #include <TelepathyQt/ContactManager>
 
@@ -579,5 +580,11 @@ void ContextMenu::onResendAuthorization()
 
 void ContextMenu::onNotificationConfigured()
 {
-    KNotifyConfigWidget::configure(m_mainWidget, QLatin1String("ktelepathy"));
+    ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+
+    Q_ASSERT(contactItem);
+    Tp::ContactPtr contact = contactItem->contact();
+
+    KTp::NotificationConfigDialog *notificationDialog = new KTp::NotificationConfigDialog(contact, m_mainWidget);
+    notificationDialog->show();
 }

-- 
ktp-contact-list packaging