[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=85f191d

The following commit has been merged in the master branch:
commit 85f191db83ceb9375362bf8d0c4504336c00210f
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Mon Dec 6 21:21:54 2010 +0200

    Fix showing the notifications.
    
    KNotify uses the application's name to determin which .notifyrc
    file to load, however the application here is kded, so we have
    to override this name by specifying another KComponentData.
---
 src/textchannelapprover.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index 3e4f9e3..19eebd6 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -21,11 +21,14 @@
 #include <KLocale>
 #include <KGlobal>
 #include <KDebug>
+#include <KPluginFactory>
 #include <TelepathyQt4/ReceivedMessage>
 #include <TelepathyQt4/AvatarData>
 #include <TelepathyQt4/ContactManager>
 #include <TelepathyQt4/PendingContacts>
 
+K_PLUGIN_FACTORY_DECLARATION(TpKDEApproverFactory)
+
 TextChannelApprover::TextChannelApprover(const Tp::TextChannelPtr & channel, QObject *parent)
     : ChannelApprover(parent), m_notifierItem(getNotifierItem())
 {
@@ -59,6 +62,7 @@ void TextChannelApprover::onMessageReceived(const Tp::ReceivedMessage & msg)
     }
 
     KNotification *notification = new KNotification("new_text_message");
+    notification->setComponentData(TpKDEApproverFactory::componentData());
     notification->setText(msg.text());
 
     if (sender) {

-- 
ktp-approver packaging