[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=78c9021

The following commit has been merged in the master branch:
commit 78c90213b90bd6db59ec0058bf15aadec97e860c
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sat Jun 20 16:50:25 2009 +0000

    Add a stub TelepathyAccount class. One instance of it will be used for each telepathy Account on the AM.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=984378
---
 kpeople/nepomuk-feeder/CMakeLists.txt              |  1 +
 ...epathyaccountmonitor.h => telepathyaccount.cpp} | 32 ++++++----------------
 ...elepathyaccountmonitor.h => telepathyaccount.h} | 20 +++++---------
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index 2fd2871..a1cdf70 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -34,6 +34,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
 set(telepathy_integration_daemon_SRCS
     telepathyaccountmonitor.cpp
+    telepathyaccount.cpp
     main.cpp
 )
 
diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h b/kpeople/nepomuk-feeder/telepathyaccount.cpp
similarity index 61%
copy from kpeople/nepomuk-feeder/telepathyaccountmonitor.h
copy to kpeople/nepomuk-feeder/telepathyaccount.cpp
index 28f3cbc..190f4e5 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -18,32 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNTMONITOR_H
-#define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNTMONITOR_H
+#include "telepathyaccount.h"
 
-#include <QtCore/QObject>
-
-#include <TelepathyQt4/AccountManager>
-
-namespace Tp {
-    class PendingOperation;
+TelepathyAccount::TelepathyAccount(const QString &path, QObject *parent)
+ : QObject(parent),
+   m_path(path)
+{
+    // TODO: Implement me!
 }
 
-class TelepathyAccountMonitor : public QObject
+TelepathyAccount::~TelepathyAccount()
 {
-    Q_OBJECT
-
-public:
-    explicit TelepathyAccountMonitor(QObject *parent = 0);
-    ~TelepathyAccountMonitor();
-
-private Q_SLOTS:
-    void onAccountManagerReady(Tp::PendingOperation *op);
-
-private:
-    Tp::AccountManagerPtr m_accountManager;
-};
-
-
-#endif // Header guard
+}
 
diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h b/kpeople/nepomuk-feeder/telepathyaccount.h
similarity index 68%
copy from kpeople/nepomuk-feeder/telepathyaccountmonitor.h
copy to kpeople/nepomuk-feeder/telepathyaccount.h
index 28f3cbc..eed97a9 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.h
@@ -18,30 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNTMONITOR_H
-#define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNTMONITOR_H
+#ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNT_H
+#define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNT_H
 
 #include <QtCore/QObject>
+#include <QtCore/QString>
 
-#include <TelepathyQt4/AccountManager>
-
-namespace Tp {
-    class PendingOperation;
-}
-
-class TelepathyAccountMonitor : public QObject
+class TelepathyAccount : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit TelepathyAccountMonitor(QObject *parent = 0);
-    ~TelepathyAccountMonitor();
+    TelepathyAccount(const QString &path, QObject *parent = 0);
+    ~TelepathyAccount();
 
 private Q_SLOTS:
-    void onAccountManagerReady(Tp::PendingOperation *op);
 
 private:
-    Tp::AccountManagerPtr m_accountManager;
+    QString m_path;
 };
 
 

-- 
ktp-common-internals packaging