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

The following commit has been merged in the master branch:
commit bd911af862a846754009d1349ce0acae658beedc
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Fri Jul 24 19:15:36 2009 +0000

    Pass the AccountManagerPtr into the Add Account Assistant.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1002010
---
 src/add-account-assistant.cpp  | 6 +++++-
 src/add-account-assistant.h    | 4 +++-
 src/kcm-telepathy-accounts.cpp | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 07ca308..f19bf55 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -44,6 +44,7 @@ public:
         kDebug();
     }
 
+    Tp::AccountManagerPtr accountManager;
     ProtocolSelectWidget *protocolSelectWidget;
     KTabWidget *tabWidget;
     ParameterEditWidget *mandatoryParametersWidget;
@@ -52,12 +53,14 @@ public:
     KPageWidgetItem *pageTwo;
 };
 
-AddAccountAssistant::AddAccountAssistant(QWidget *parent)
+AddAccountAssistant::AddAccountAssistant(Tp::AccountManagerPtr accountManager, QWidget *parent)
  : KAssistantDialog(parent),
    d(new Private)
 {
     kDebug();
 
+    d->accountManager = accountManager;
+
     // Set up the pages of the Assistant.
     d->protocolSelectWidget = new ProtocolSelectWidget(this);
     d->pageOne = new KPageWidgetItem(d->protocolSelectWidget);
@@ -147,6 +150,7 @@ void AddAccountAssistant::accept()
         }
     }
 
+    // Get the optional properties
     QMap<Tp::ProtocolParameter*, QVariant> optionalParameterValues =
             d->optionalParametersWidget->parameterValues();
 }
diff --git a/src/add-account-assistant.h b/src/add-account-assistant.h
index 524ab2f..f9c22af 100644
--- a/src/add-account-assistant.h
+++ b/src/add-account-assistant.h
@@ -23,12 +23,14 @@
 
 #include <KAssistantDialog>
 
+#include <TelepathyQt4/AccountManager>
+
 class AddAccountAssistant : public KAssistantDialog
 {
     Q_OBJECT
 
 public:
-    explicit AddAccountAssistant(QWidget *parent = 0);
+    explicit AddAccountAssistant(Tp::AccountManagerPtr accountManager, QWidget *parent = 0);
     ~AddAccountAssistant();
 
 protected Q_SLOTS:
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 4870448..e7043f7 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -106,10 +106,16 @@ void KCMTelepathyAccounts::onAddAccountClicked()
 {
     kDebug();
 
+    // Wizard only works if the AccountManager is ready.
+    if (!m_accountManager->isReady()) {
+        return;
+    }
+
     // Ensure that there is not already an instance of the AddAccountAssistant before we create one.";
     if (!m_addAccountAssistant) {
+
         // Create an AddAccountAssistant instance
-        m_addAccountAssistant = new AddAccountAssistant(this);
+        m_addAccountAssistant = new AddAccountAssistant(m_accountManager, this);
 
         // Connect to its completion signals...
         connect(m_addAccountAssistant, SIGNAL(cancelled()),

-- 
ktp-accounts-kcm packaging