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

The following commit has been merged in the master branch:
commit 7e7f262192c2a8bc4fc58a54a72e59edef13a0d4
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sat Jun 20 18:58:48 2009 +0000

    Add nepomuk to build requirements, and stub function for setting up the nepomuk stuff for each account.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=984445
---
 kpeople/nepomuk-feeder/CMakeLists.txt       |  3 +++
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 12 +++++++++++-
 kpeople/nepomuk-feeder/telepathyaccount.h   |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index a1cdf70..45cf7fc 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -11,6 +11,7 @@ include(CheckIncludeFiles)
 find_package (KdepimLibs REQUIRED)
 
 find_package (TelepathyQt4 REQUIRED)
+find_package(Nepomuk REQUIRED)
 
 if(WIN32)
     set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
@@ -25,6 +26,7 @@ include_directories(
     ${KDE4_INCLUDES}
     ${KDEPIMLIBS_INCLUDE_DIRS}
     ${TELEPATHY_QT4_INCLUDE_DIR}
+    ${NEPOMUK_INCLUDES}
 )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
@@ -45,6 +47,7 @@ target_link_libraries(telepathy-integration-daemon ${KDE4_AKONADI_LIBS}
                                                    ${QT_QTDBUS_LIBRARY}
                                                    ${KDE4_KDECORE_LIBS}
                                                    ${TELEPATHY_QT4_LIBRARIES}
+                                                   ${NEPOMUK_LIBRARIES}
 )
 
 install(TARGETS telepathy-integration-daemon ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index 190f4e5..17e8c62 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -24,10 +24,20 @@ TelepathyAccount::TelepathyAccount(const QString &path, QObject *parent)
  : QObject(parent),
    m_path(path)
 {
-    // TODO: Implement me!
+    // FIXME: Check there is an akonadi resource for this account, and create one if not.
+
+    // Check that this Account is set up in nepomuk.
+    doNepomukSetup();
 }
 
 TelepathyAccount::~TelepathyAccount()
 {
 }
 
+void TelepathyAccount::doNepomukSetup()
+{
+    // Query Nepomuk to find out if the "me" pimo:person has a nco:contact instance for this
+    // Telepathy instant messaging account.
+
+    // TODO: Implement me!
+}
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.h b/kpeople/nepomuk-feeder/telepathyaccount.h
index eed97a9..4681a1d 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.h
@@ -35,6 +35,8 @@ public:
 private Q_SLOTS:
 
 private:
+    void doNepomukSetup();
+
     QString m_path;
 };
 

-- 
ktp-common-internals packaging