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

The following commit has been merged in the master branch:
commit e31258274efbbe82fd41a6a3e26e245fd1894f19
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Oct 26 17:59:58 2011 +0200

    Remove the password from KWallet before removing account
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    BUG: 283986
---
 src/kcm-telepathy-accounts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 3715eac..c0511f5 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -309,11 +309,11 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
                                         i18n("Remove Account"), KGuiItem(i18n("Remove Account"), "edit-delete"), KStandardGuiItem::cancel(),
                                         QString(), KMessageBox::Notify | KMessageBox::Dangerous) == KMessageBox::Continue)
     {
-        m_accountsListModel->removeAccount(m_currentModel->mapToSource(index));
-
         AccountItem *item = m_accountsListModel->itemForIndex(m_currentModel->mapToSource(index));
         WalletInterface wallet(this->effectiveWinId());
         wallet.removePassword(item->account());
+
+        m_accountsListModel->removeAccount(m_currentModel->mapToSource(index));
     }
 }
 

-- 
ktp-accounts-kcm packaging