[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=6853e0a

The following commit has been merged in the master branch:
commit 6853e0a46ed99907082b2da1f8676852b67dd37f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sun Nov 17 11:53:47 2013 +0100

    Add accountForAccountPath and contactForContactId methods
    
    The others like accountForAccountId can probably be removed now
---
 KTp/global-contact-manager.cpp | 28 ++++++++++++++++++++++++++++
 KTp/global-contact-manager.h   |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index d747ead..2b4960d 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -172,3 +172,31 @@ Tp::AccountPtr GlobalContactManager::accountForAccountId(const QString &accountI
 
     return Tp::AccountPtr();
 }
+
+Tp::AccountPtr GlobalContactManager::accountForAccountPath(const QString &accountPath) const
+{
+    if (!d->accountManager.isNull() && d->accountManager->isReady()) {
+        return d->accountManager->accountForPath(accountPath);
+    }
+
+    return Tp::AccountPtr();
+}
+
+KTp::ContactPtr GlobalContactManager::contactForContactId(const QString &accountPath, const QString &contactId)
+{
+    if (!d->accountManager || accountPath.isEmpty()) {
+        return KTp::ContactPtr();
+    }
+
+    Tp::AccountPtr account = d->accountManager->accountForObjectPath(accountPath);
+    if (account->connection() && account->connection()->contactManager()) {
+        Tp::Contacts contactSet = account->connection()->contactManager()->allKnownContacts();
+        Q_FOREACH (const Tp::ContactPtr &contact, contactSet) {
+            if (contact->id() == contactId) {
+                return KTp::ContactPtr::qObjectCast(contact);
+            }
+        }
+    }
+
+    return KTp::ContactPtr();
+}
diff --git a/KTp/global-contact-manager.h b/KTp/global-contact-manager.h
index 49055ba..28c7089 100644
--- a/KTp/global-contact-manager.h
+++ b/KTp/global-contact-manager.h
@@ -27,6 +27,7 @@
 #include <TelepathyQt/ContactManager>
 
 #include <KTp/ktp-export.h>
+#include <KTp/contact.h>
 
 namespace KTp {
 
@@ -43,6 +44,8 @@ public:
     Tp::AccountPtr accountForConnection(const Tp::ConnectionPtr &connection) const;
     Tp::AccountPtr accountForContact(const Tp::ContactPtr &contact) const;
     Tp::AccountPtr accountForAccountId(const QString &accountId) const;
+    Tp::AccountPtr accountForAccountPath(const QString &accountPath) const;
+    KTp::ContactPtr contactForContactId(const QString &accountPath, const QString &contactId);
 
 Q_SIGNALS:
     void allKnownContactsChanged(const Tp::Contacts &contactsAdded, const Tp::Contacts &contactsRemoved);

-- 
ktp-common-internals packaging