[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=9f47432

The following commit has been merged in the master branch:
commit 9f47432da43b1b516ef2b401b3467eeae10f65a5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Aug 31 12:32:32 2013 +0000

    Remove unused method
    
    BUG: 324304
---
 KTp/im-persons-data-source.cpp | 35 -----------------------------------
 KTp/im-persons-data-source.h   |  1 -
 2 files changed, 36 deletions(-)

diff --git a/KTp/im-persons-data-source.cpp b/KTp/im-persons-data-source.cpp
index 2ea1d85..ebd01ba 100644
--- a/KTp/im-persons-data-source.cpp
+++ b/KTp/im-persons-data-source.cpp
@@ -210,41 +210,6 @@ Tp::AccountPtr IMPersonsDataSource::accountForContact(const KTp::ContactPtr &con
     return d->contactManager->accountForContact(contact);
 }
 
-Tp::AccountPtr IMPersonsDataSource::accountForContactId(const QString &contactId) const
-{
-    if (contactId.isEmpty()) {
-        kDebug() << "empty contact id";
-    }
-
-    KTp::ContactPtr contact = contactForContactId(contactId);
-    if (contact.isNull()) {
-        QString query = QString::fromUtf8(
-            "select DISTINCT ?a "
-            "WHERE { "
-                "?x a nco:ContactMedium . "
-                "?x nco:imID \"%1\"^^xsd:string . "
-                "?x nco:isAccessedBy ?c . "
-                "?c telepathy:accountIdentifier ?a . "
-                "}").arg(contactId);
-
-                kDebug() << query;
-
-        Soprano::Model *model = Nepomuk2::ResourceManager::instance()->mainModel();
-        Soprano::QueryResultIterator it = model->executeQuery(query, Soprano::Query::QueryLanguageSparql);
-
-        QString accountPath;
-
-        it.next(); //set the iterator to first entry
-        accountPath = it[0].literal().toString();
-        kDebug() << "got account path" << accountPath;
-        //nepomuk stores account path, which is in form /org/freedesktop/Telepathy/Account/...
-        //while GCM looks for uniqueIdentifier(), which is without this^ prefix, so we need to chop it off first
-        return d->contactManager->accountForAccountId(accountPath.remove(0,35));
-    } else {
-        return accountForContact(contact);
-    }
-}
-
 Tp::AccountManagerPtr IMPersonsDataSource::accountManager() const
 {
     return d->accountManager;
diff --git a/KTp/im-persons-data-source.h b/KTp/im-persons-data-source.h
index dda7701..e6a3229 100644
--- a/KTp/im-persons-data-source.h
+++ b/KTp/im-persons-data-source.h
@@ -40,7 +40,6 @@ public:
     QVariant dataForContact(const QString &contactId, int role) const;
     KTp::ContactPtr contactForContactId(const QString &contactId) const;
     Tp::AccountPtr accountForContact(const KTp::ContactPtr &contact) const;
-    Tp::AccountPtr accountForContactId(const QString &contactId) const;
 
     Tp::AccountManagerPtr accountManager() const;
 

-- 
ktp-common-internals packaging