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

The following commit has been merged in the master branch:
commit a52b5af5c2879b712ff455ad82552afadcadb397
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 25 23:19:04 2011 +0100

    Remove redundant init
---
 contact-request-handler.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 741f709..b86ad4c 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -139,10 +139,9 @@ void ContactRequestHandler::onPresencePublicationRequested(const Tp::Contacts& c
 
     Q_FOREACH (const Tp::ContactPtr &contact, contacts) {
         Tp::ContactManagerPtr manager = contact->manager();
-        Tp::PendingOperation *op = 0;
 
         if (contact->subscriptionState() == Tp::Contact::PresenceStateYes) {
-            op = manager->authorizePresencePublication(QList< Tp::ContactPtr >() << contact);
+            Tp::PendingOperation *op = manager->authorizePresencePublication(QList< Tp::ContactPtr >() << contact);
             op->setProperty("__contact", QVariant::fromValue(contact));
 
             connect(op, SIGNAL(finished(Tp::PendingOperation*)),

-- 
ktp-kded-integration-module packaging