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

The following commit has been merged in the master branch:
commit bc92765506a7a37db35268fa2f435fa57623b0df
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Nov 21 18:24:53 2012 +0900

    Update to not using AccountContact
    
    REVIEW: 107401
---
 contactnotify.cpp | 26 +++++++++++++-------------
 contactnotify.h   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contactnotify.cpp b/contactnotify.cpp
index 65bdaac..ad82a73 100644
--- a/contactnotify.cpp
+++ b/contactnotify.cpp
@@ -45,16 +45,16 @@ ContactNotify::ContactNotify(const Tp::AccountManagerPtr &accountMgr, QObject *p
 
     Tp::Presence currentPresence;
 
-    Q_FOREACH(const AccountContact &contact, contactManager->allKnownContacts()) {
-        connect(contact.contact().data(), SIGNAL(presenceChanged(Tp::Presence)),
+    Q_FOREACH(const Tp::ContactPtr &contact, contactManager->allKnownContacts()) {
+        connect(contact.data(), SIGNAL(presenceChanged(Tp::Presence)),
                 SLOT(contactPresenceChanged(Tp::Presence)));
 
-        currentPresence = contact.contact()->presence();
-        m_presenceHash[contact.contact()->id()] = Presence::sortPriority(currentPresence.type());
+        currentPresence = contact->presence();
+        m_presenceHash[contact->id()] = Presence::sortPriority(currentPresence.type());
     }
 
-    connect(contactManager, SIGNAL(allKnownContactsChanged(AccountContactList,AccountContactList)),
-            SLOT(onContactsChanged(AccountContactList,AccountContactList)));
+    connect(contactManager, SIGNAL(allKnownContactsChanged(Tp::Contacts,Tp::Contacts)),
+            SLOT(onContactsChanged(Tp::Contacts,Tp::Contacts)));
 }
 
 
@@ -95,20 +95,20 @@ void ContactNotify::sendNotification(const QString &text, const KIcon &icon, con
     notification->sendEvent();
 }
 
-void ContactNotify::onContactsChanged(const AccountContactList &contactsAdded, const AccountContactList &contactsRemoved)
+void ContactNotify::onContactsChanged(const Tp::Contacts &contactsAdded, const Tp::Contacts &contactsRemoved)
 {
     Tp::Presence currentPresence;
 
-    Q_FOREACH(const AccountContact &contact, contactsAdded) {
-        connect(contact.contact().data(), SIGNAL(presenceChanged(Tp::Presence)),
+    Q_FOREACH(const Tp::ContactPtr &contact, contactsAdded) {
+        connect(contact.data(), SIGNAL(presenceChanged(Tp::Presence)),
                 SLOT(contactPresenceChanged(Tp::Presence)));
 
-        currentPresence = contact.contact().data()->presence();
-        m_presenceHash[contact.contact()->id()] = Presence::sortPriority(currentPresence.type());
+        currentPresence = contact->presence();
+        m_presenceHash[contact->id()] = Presence::sortPriority(currentPresence.type());
 
     }
 
-    Q_FOREACH(const AccountContact &contact, contactsRemoved) {
-        m_presenceHash.remove(contact.contact()->id());
+    Q_FOREACH(const Tp::ContactPtr &contact, contactsRemoved) {
+        m_presenceHash.remove(contact->id());
     }
  }
diff --git a/contactnotify.h b/contactnotify.h
index 462b3f3..9018114 100644
--- a/contactnotify.h
+++ b/contactnotify.h
@@ -35,7 +35,7 @@ public:
     ContactNotify(const Tp::AccountManagerPtr &accountMgr, QObject *parent = 0);
 
 private Q_SLOTS:
-    void onContactsChanged(const AccountContactList &contactsAdded, const AccountContactList &contactsRemoved);
+    void onContactsChanged(const Tp::Contacts &contactsAdded, const Tp::Contacts &contactsRemoved);
     void contactPresenceChanged(const Tp::Presence &presence);
 
 private:

-- 
ktp-kded-integration-module packaging