[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b6504fc

The following commit has been merged in the master branch:
commit b6504fce1447a4ba445a06911fb9a80a1307da7c
Author: Vishesh Handa <handa.vish at gmail.com>
Date:   Tue Mar 20 22:32:24 2012 +0530

    Fix NepomukStorage::setContactSubscriptionState
    
    Use the correct properties.
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index a215cd5..c362561 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2009-2011 Collabora Ltd. <info at collabora.co.uk>
  *   @author George Goldberg <george.goldberg at collabora.co.uk>
  *
- * Copyright (C) 2011-2012 Vishesh Handa <handa.vish at gmail.com>
+ * Copyright (C) 2011-2012 Vishesh Handa <me at vhanda.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1015,7 +1015,7 @@ void NepomukStorage::setContactSubscriptionState(const QString &path,
     if( usPublish ) {
         Nepomuk::SimpleResource &localAccountRes = m_graph[localAccountUri];
         localAccountRes.setUri( localAccountUri );
-        localAccountRes.setProperty( NCO::requestedPresenceSubscriptionTo(), imAccountUri );
+        localAccountRes.setProperty( NCO::publishesPresenceTo(), imAccountUri );
 
         fireGraphTimer();
     }
@@ -1036,9 +1036,9 @@ void NepomukStorage::setContactSubscriptionState(const QString &path,
     }
     else {
         // Remove us from their publish list
-        KJob* job = Nepomuk::removeProperty( QList<QUrl>() << imAccountUri,
-                                             NCO::requestedPresenceSubscriptionTo(),
-                                             QVariantList() << localAccountUri );
+        KJob* job = Nepomuk::removeProperties( QList<QUrl>() << imAccountUri,
+                                               QList<QUrl>() << NCO::requestedPresenceSubscriptionTo()
+                                                             << NCO::publishesPresenceTo() );
         connect( job, SIGNAL(finished(KJob*)), this, SLOT(onRemovePropertiesJob(KJob*)) );
     }
 }

-- 
ktp-common-internals packaging