[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=43bbadf

The following commit has been merged in the master branch:
commit 43bbadfcba77a3005f3f61255e582b0058198c27
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 22 19:03:46 2009 +0000

    Enable cancelling and tidy up correctly after it in the add account assistant.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001252
---
 src/add-account-assistant.cpp  |  6 +++++-
 src/add-account-assistant.h    |  3 +++
 src/kcm-telepathy-accounts.cpp | 18 +++++++++++++++++-
 src/kcm-telepathy-accounts.h   |  2 ++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 81440cd..5f70648 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -101,6 +101,10 @@ void AddAccountAssistant::reject()
 {
     kDebug();
 
-    // TODO: Implement me!
+    // Emit a signal to tell the assistant launcher that it was cancelled.
+    Q_EMIT cancelled();
+
+    // Close the assistant
+    KAssistantDialog::reject();
 }
 
diff --git a/src/add-account-assistant.h b/src/add-account-assistant.h
index 2d5705e..524ab2f 100644
--- a/src/add-account-assistant.h
+++ b/src/add-account-assistant.h
@@ -37,6 +37,9 @@ protected Q_SLOTS:
     virtual void accept();
     virtual void reject();
 
+Q_SIGNALS:
+    void cancelled();
+
 private:
     class Private;
     Private * const d;
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index fc1f541..4870448 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -108,15 +108,31 @@ void KCMTelepathyAccounts::onAddAccountClicked()
 
     // Ensure that there is not already an instance of the AddAccountAssistant before we create one.";
     if (!m_addAccountAssistant) {
-        // Create an AddAccountAssistant instance and show it.
+        // Create an AddAccountAssistant instance
         m_addAccountAssistant = new AddAccountAssistant(this);
+
+        // Connect to its completion signals...
+        connect(m_addAccountAssistant, SIGNAL(cancelled()),
+                this, SLOT(onAddAccountAssistantCancelled()));
+
+        // ...and finally show it.
         m_addAccountAssistant->show();
+
         return;
     }
 
     kWarning() << "Cannot create a new AddAccountAssistant. One already exists.";
 }
 
+void KCMTelepathyAccounts::onAddAccountAssistantCancelled()
+{
+    kDebug();
+
+    // Add account assistant has been cancelled. Delete it.
+    m_addAccountAssistant->deleteLater();
+    m_addAccountAssistant = 0;
+}
+
 
 #include "kcm-telepathy-accounts.moc"
 
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index 659af2d..04797aa 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -51,7 +51,9 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
+
     void onAddAccountClicked();
+    void onAddAccountAssistantCancelled();
 
 private:
     KCategorizedSortFilterProxyModel *m_accountsListProxyModel;

-- 
ktp-accounts-kcm packaging