[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=262eea4

The following commit has been merged in the master branch:
commit 262eea40b6f3091b3a46a48db3717ce46235420f
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Tue Aug 11 19:52:18 2009 +0000

    Enable the account after we create it.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1010166
---
 src/add-account-assistant.cpp | 31 +++++++++++++++++++++++++++++++
 src/add-account-assistant.h   |  1 +
 2 files changed, 32 insertions(+)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 743bd2e..9147c23 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -54,6 +54,7 @@ public:
     }
 
     Tp::AccountManagerPtr accountManager;
+    Tp::AccountPtr account;
     ProtocolSelectWidget *protocolSelectWidget;
     KTabWidget *tabWidget;
     AbstractAccountParametersWidget *mandatoryParametersWidget;
@@ -343,12 +344,42 @@ void AddAccountAssistant::reject()
 
 void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
 {
+    kDebug();
+
     if (op->isError()) {
         // TODO: User feedback in this case.
         kWarning() << "Adding Account failed:" << op->errorName() << op->errorMessage();
         return;
     }
 
+    // Get the PendingAccount.
+    Tp::PendingAccount *pendingAccount = qobject_cast<Tp::PendingAccount*>(op);
+    if (!pendingAccount) {
+        // TODO: User visible feedback
+        kWarning() << "Method called with wrong type.";
+        return;
+    }
+
+    // Get the account pointer.
+    d->account = pendingAccount->account();
+
+    kDebug() << "Calling set enabled.";
+
+    connect(d->account->setEnabled(true),
+            SIGNAL(finished(Tp::PendingOperation*)),
+            SLOT(onSetEnabledFinished(Tp::PendingOperation*)));
+}
+
+void AddAccountAssistant::onSetEnabledFinished(Tp::PendingOperation *op)
+{
+    kDebug();
+
+    if (op->isError()) {
+        // TODO: User feedback in this case.
+        kWarning() << "Enabling Account failed:" << op->errorName() << op->errorMessage();
+        return;
+    }
+
     KAssistantDialog::accept();
 }
 
diff --git a/src/add-account-assistant.h b/src/add-account-assistant.h
index 665f06c..b16d76b 100644
--- a/src/add-account-assistant.h
+++ b/src/add-account-assistant.h
@@ -47,6 +47,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void onAccountCreated(Tp::PendingOperation *op);
+    void onSetEnabledFinished(Tp::PendingOperation *op);
     void onProtocolSelected(bool value);
 
 private:

-- 
ktp-accounts-kcm packaging