[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=0e8581e

The following commit has been merged in the master branch:
commit 0e8581ea54d0b8aba86c5409f6da246baf3fda2c
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 25 01:27:39 2011 +0100

    Fix notification usage
---
 contact-request-handler.cpp | 15 +++++----------
 contact-request-handler.h   |  1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 505b2b4..8a197f7 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -138,19 +138,14 @@ void ContactRequestHandler::onPresencePublicationRequested(const Tp::Contacts& c
         if (contact->subscriptionState() == Tp::Contact::PresenceStateYes) {
             op = manager->authorizePresencePublication(QList< Tp::ContactPtr >() << contact);
         } else {
-            KNotification *notification = new KNotification(QLatin1String("telepathyInfo"), KNotification::CloseOnTimeout);
-
-            KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
-            notification->setComponentData(KComponentData(aboutData));
-
-            notification->setText(i18n("The contact %1 added you to their contact list. "
-                                       "Do you want to allow this person to see your presence "
-                                       "and add them to your contact list?", contact->id()));
-            notification->sendEvent();
-
             m_pendingContacts.insert(contact->id(), contact);
 
             updateMenus();
+
+            m_notifierItem.data()->showMessage(i18n("New contact request"),
+                                               i18n("The contact %1 added you to its contact list",
+                                                    contact->id()),
+                                               QLatin1String("list-add-user"));
         }
 
         if (op) {
diff --git a/contact-request-handler.h b/contact-request-handler.h
index f3ada98..08eba19 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -56,7 +56,6 @@ private:
     KStatusNotifierItem *notifierItem();
     void updateNotifierItemTooltip();
 
-    QWeakPointer<KNotification> m_notification;
     QWeakPointer<KStatusNotifierItem> m_notifierItem;
     Tp::AccountManagerPtr m_accountManager;
     KMenu *m_notifierMenu;

-- 
ktp-kded-integration-module packaging