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

The following commit has been merged in the master branch:
commit feb25d28a6ef5522bd2fb4433d2276ef96c997a3
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sun Jul 5 17:46:01 2009 +0000

    Stub method for setting up the Akonadi side of things.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=991801
---
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 8 ++++++++
 kpeople/nepomuk-feeder/telepathyaccount.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index bbf0713..e9f4318 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -70,6 +70,9 @@ void TelepathyAccount::onAccountReady(Tp::PendingOperation *op)
 
     // Check that this Account is set up in nepomuk.
     doNepomukSetup();
+
+    // Once the nepomuk setup is complete, do the Akonadi setup.
+    doAkonadiSetup();
 }
 
 void TelepathyAccount::doNepomukSetup()
@@ -105,3 +108,8 @@ void TelepathyAccount::doNepomukSetup()
     me.addProperty(Nepomuk::Vocabulary::NCO::PersonContact(), contact);
 }
 
+void TelepathyAccount::doAkonadiSetup()
+{
+    // FIXME: Implement me!
+}
+
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.h b/kpeople/nepomuk-feeder/telepathyaccount.h
index d6203af..fe0633c 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.h
@@ -45,6 +45,7 @@ private Q_SLOTS:
 
 private:
     void doNepomukSetup();
+    void doAkonadiSetup();
 
     TelepathyAccountMonitor *m_parent;
     QString m_path;

-- 
ktp-common-internals packaging