[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=7fdd541

The following commit has been merged in the master branch:
commit 7fdd5412d85463fddac07ec79730938f0ddfa4b8
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Jan 26 20:13:23 2009 +0000

    Set up an AccountManager and have it becomeReady() on startup of the KCM.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=917073
---
 src/kcm-telepathy-accounts.cpp | 42 +++++++++++++++++++++++++++++++++++++++++-
 src/kcm-telepathy-accounts.h   | 17 ++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 8dfae80..a7e4177 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -23,6 +23,9 @@
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kgenericfactory.h>
 
+#include <TelepathyQt4/Client/AccountManager>
+#include <TelepathyQt4/Client/PendingOperation>
+
 
 K_PLUGIN_FACTORY(KCMTelepathyAccountsFactory, registerPlugin<KCMTelepathyAccounts>();)
 K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy_accounts"))
@@ -30,10 +33,12 @@ K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy
 
 KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
  : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
-   m_accountsListProxyModel(0)
+   m_accountsListProxyModel(0),
+   m_accountManager(0)
 {
     // TODO: Implement me!
     setupUi(this);
+    startAccountManager();
 }
 
 KCMTelepathyAccounts::~KCMTelepathyAccounts()
@@ -41,6 +46,41 @@ KCMTelepathyAccounts::~KCMTelepathyAccounts()
     // TODO: Implement me!
 }
 
+void KCMTelepathyAccounts::load()
+{
+    // This slot is called whenever the configuration data in this KCM should
+    // be reloaded from the store. We will not actually do anything here since
+    // all changes that are made in this KCM are, at the moment, saved
+    // immediately and cannot be reverted programatically.
+    return;
+}
+
+void KCMTelepathyAccounts::startAccountManager()
+{
+    // This slot is called on construction to set up a telepathy accountmanager
+    // instance.
+    m_accountManager = new Telepathy::Client::AccountManager(this);
+
+    connect(m_accountManager->becomeReady(), SIGNAL(finished(Telepathy::Client::PendingOperation*)),
+            this, SLOT(startAccountManagerFinished(Telepathy::Client::PendingOperation*)));
+}
+
+void KCMTelepathyAccounts::startAccountManagerFinished(Telepathy::Client::PendingOperation *op)
+{
+    Q_ASSERT(op->isFinished());
+    if(op->isError())
+    {
+        kDebug() << "An error occurred setting up the AccountManager.";
+        return;
+    }
+    else
+    {
+        kDebug() << "AccountManager set up successfully.";
+    }
+
+    // TODO: Load the model up with Accounts from the Account Manager.
+}
+
 
 #include "kcm-telepathy-accounts.moc"
 
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index 878b283..faba8d5 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -27,6 +27,13 @@
 
 class KCategorizedSortFilterProxyModel;
 
+namespace Telepathy {
+    namespace Client {
+        class AccountManager;
+        class PendingOperation;
+    }
+}
+
 class KCMTelepathyAccounts : public KCModule, Ui::MainWidget
 {
     Q_OBJECT
@@ -35,10 +42,18 @@ class KCMTelepathyAccounts : public KCModule, Ui::MainWidget
 public:
     explicit KCMTelepathyAccounts(QWidget *parent = 0,
                                   const QVariantList& args = QVariantList());
-    virtual ~KCMTelepathyAccounts();
+    ~KCMTelepathyAccounts();
+
+public Q_SLOTS:
+    void load();
+
+private Q_SLOTS:
+    void startAccountManager();
+    void startAccountManagerFinished(Telepathy::Client::PendingOperation *op);
 
 private:
     KCategorizedSortFilterProxyModel *m_accountsListProxyModel;
+    Telepathy::Client::AccountManager *m_accountManager;
 
 };
 

-- 
ktp-accounts-kcm packaging