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

The following commit has been merged in the master branch:
commit aedcf5108fccce785376dca63549684f8f731c19
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 12 21:10:18 2012 +0900

    show debug feedback on remove account completion
---
 src/kcm-telepathy-accounts.cpp | 9 ++++++++-
 src/kcm-telepathy-accounts.h   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index f2e40ad..8cab323 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -338,7 +338,7 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
          QList<Tp::PendingOperation*> ops;
          ops.append(KTp::WalletUtils::removeAccountPassword(account));
          ops.append(account->remove());
-         new Tp::PendingComposite(ops, account);
+         connect(new Tp::PendingComposite(ops, account), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onOperationFinished(Tp::PendingOperation*)));
      }
 }
 
@@ -417,6 +417,13 @@ void KCMTelepathyAccounts::onSalutSetupDone()
     m_ui->salutWidget->setEnabled(true);
 }
 
+void KCMTelepathyAccounts::onOperationFinished(Tp::PendingOperation *op)
+{
+    if (op->isError()) {
+        kDebug() << "operation failed " << op->errorName() << op->errorMessage();
+    }
+}
+
 /////
 
 ErrorOverlay::ErrorOverlay(QWidget *baseWidget, const QString &details, QWidget *parent) :
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index 823ce6b..7ef5bd7 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -70,6 +70,7 @@ private Q_SLOTS:
     void onSalutInfoReady();
 
     void onSalutSetupDone();
+    void onOperationFinished(Tp::PendingOperation *op);
 
 private:
     Ui::MainWidget *m_ui;

-- 
ktp-accounts-kcm packaging