[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=995b0ea

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

    Show new accounts in the list when they are created on the Account Manager. Also delete the AddAccountAssistant when it is finished so that it can be launched again.
    
    BUG: 201801
    
    Thanks to Matteo Nardi for the patch.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1004202
---
 src/kcm-telepathy-accounts.cpp | 16 ++++++++++++++--
 src/kcm-telepathy-accounts.h   |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 1d8cea6..1868351 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -106,6 +106,16 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
     foreach (Tp::AccountPtr account, accounts) {
         m_accountsListModel->addAccount(account);
     }
+
+    connect(m_accountManager.data(),
+            SIGNAL(accountCreated(const QString &)),
+            SLOT(onAccountCreated(const QString &)));
+}
+
+void KCMTelepathyAccounts::onAccountCreated(const QString &path)
+{
+    Tp::AccountPtr account = m_accountManager->accountForPath(path);
+    m_accountsListModel->addAccount(account);
 }
 
 void KCMTelepathyAccounts::onSelectedItemChanged()
@@ -132,7 +142,9 @@ void KCMTelepathyAccounts::onAddAccountClicked()
 
         // Connect to its completion signals...
         connect(m_addAccountAssistant, SIGNAL(cancelled()),
-                this, SLOT(onAddAccountAssistantCancelled()));
+                this, SLOT(onAddAccountAssistantClosed()));
+        connect(m_addAccountAssistant, SIGNAL(accepted()),
+                this, SLOT(onAddAccountAssistantClosed()));
 
         // ...and finally show it.
         m_addAccountAssistant->show();
@@ -156,7 +168,7 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
     }
 }
 
-void KCMTelepathyAccounts::onAddAccountAssistantCancelled()
+void KCMTelepathyAccounts::onAddAccountAssistantClosed()
 {
     kDebug();
 
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index a90d5b2..c192ce5 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -49,11 +49,12 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
+    void onAccountCreated(const QString &path);
 
     void onSelectedItemChanged();
     void onAddAccountClicked();
     void onRemoveAccountClicked();
-    void onAddAccountAssistantCancelled();
+    void onAddAccountAssistantClosed();
 
 private:
     Tp::AccountManagerPtr m_accountManager;

-- 
ktp-accounts-kcm packaging