[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=71e1917

The following commit has been merged in the master branch:
commit 71e1917c1c2dd2159991e9b3c31a6a703bda6796
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sat Feb 13 16:35:24 2010 +0000

    Pass in the Nepomuk IMAccount for the account these contacts are buddies of.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1089649
---
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 2 +-
 kpeople/nepomuk-feeder/telepathycontact.cpp | 4 +++-
 kpeople/nepomuk-feeder/telepathycontact.h   | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index 8724940..1209882 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -246,7 +246,7 @@ void TelepathyAccount::onContactsUpgraded(Tp::PendingOperation* op)
     // We have an upgraded contact list. Now we can create a TelepathyContact instance for
     // each contact.
     foreach (Tp::ContactPtr contact, pc->contacts()) {
-        new TelepathyContact(contact, m_connection, this);
+        new TelepathyContact(contact, m_connection, m_accountResource, this);
     }
 }
 
diff --git a/kpeople/nepomuk-feeder/telepathycontact.cpp b/kpeople/nepomuk-feeder/telepathycontact.cpp
index cc0f861..68abdf5 100644
--- a/kpeople/nepomuk-feeder/telepathycontact.cpp
+++ b/kpeople/nepomuk-feeder/telepathycontact.cpp
@@ -27,11 +27,13 @@
 
 TelepathyContact::TelepathyContact(Tp::ContactPtr contact,
                                    Tp::ConnectionPtr connection,
+                                   Nepomuk::IMAccount accountResource,
                                    TelepathyAccount *parent)
  : QObject(parent),
    m_parent(parent),
    m_contact(contact),
-   m_connection(connection)
+   m_connection(connection),
+   m_accountResource(accountResource)
 {
     kDebug() << "New TelepathyContact Created:"
              << m_contact.data()
diff --git a/kpeople/nepomuk-feeder/telepathycontact.h b/kpeople/nepomuk-feeder/telepathycontact.h
index e26c813..ff34afb 100644
--- a/kpeople/nepomuk-feeder/telepathycontact.h
+++ b/kpeople/nepomuk-feeder/telepathycontact.h
@@ -22,6 +22,8 @@
 #ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYCONTACT_H
 #define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYCONTACT_H
 
+#include "imaccount.h"
+
 #include <QtCore/QObject>
 
 #include <TelepathyQt4/Connection>
@@ -39,6 +41,7 @@ class TelepathyContact : public QObject
 public:
     explicit TelepathyContact(Tp::ContactPtr contact,
                               Tp::ConnectionPtr connection,
+                              Nepomuk::IMAccount accountResource,
                               TelepathyAccount *parent = 0);
     ~TelepathyContact();
 
@@ -48,6 +51,7 @@ private:
     TelepathyAccount *m_parent;
     Tp::ContactPtr m_contact;
     Tp::ConnectionPtr m_connection;
+    Nepomuk::IMAccount m_accountResource;
 };
 
 

-- 
ktp-common-internals packaging