[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=0a29782

The following commit has been merged in the master branch:
commit 0a2978218acc944d82620739b877ee97770979c6
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Feb 26 17:16:13 2015 +0100

    Couple fixes in the KTp create account dialog handling
    
    BUG: 344593
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index ca1b7af..ffd2ddb 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -176,8 +176,8 @@ void KAccountsUiProvider::onConnectionManagerReady(Tp::PendingOperation*)
                                                  d->dialog);
 
     QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, d->dialog);
-    connect(dbb, SIGNAL(accepted()), this, SLOT(onCreateAccountDialogAccepted()));
-    connect(dbb, SIGNAL(rejected()), this, SLOT(onCreateAccountDialogRejected()));
+    connect(dbb, &QDialogButtonBox::accepted, this, &KAccountsUiProvider::onCreateAccountDialogAccepted);
+    connect(dbb, &QDialogButtonBox::rejected, this, &KAccountsUiProvider::onCreateAccountDialogRejected);
 
     mainLayout->addWidget(d->accountEditWidget);
     mainLayout->addWidget(dbb);
@@ -228,8 +228,8 @@ void KAccountsUiProvider::showConfigureAccountDialog(const quint32 accountId)
     d->dialog->setProperty("accountId", accountId);
 
     QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, d->dialog);
-    connect(dbb, SIGNAL(accepted()), this, SLOT(onConfigureAccountDialogAccepted()));
-    connect(dbb, SIGNAL(rejected()), this, SLOT(onConfigureAccountDialogRejected()));
+    connect(dbb, &QDialogButtonBox::accepted, this, &KAccountsUiProvider::onConfigureAccountDialogAccepted);
+    connect(dbb, &QDialogButtonBox::rejected, this, &KAccountsUiProvider::onConfigureAccountDialogRejected);
 
     if (passwordParameter.isValid()) {
         QModelIndex index = parameterModel->indexForParameter(passwordParameter);
@@ -237,6 +237,7 @@ void KAccountsUiProvider::showConfigureAccountDialog(const quint32 accountId)
         connect(credentialsJob, &GetCredentialsJob::finished, [=](KJob *job){
             QString secret = qobject_cast<GetCredentialsJob*>(job)->credentialsData().value(QLatin1String("Secret")).toString();
             parameterModel->setData(index, secret, Qt::EditRole);
+            job->deleteLater();
         });
         credentialsJob->start();
     }
@@ -307,6 +308,7 @@ void KAccountsUiProvider::onCreateAccountDialogAccepted()
 void KAccountsUiProvider::onCreateAccountDialogRejected()
 {
     d->dialog->reject();
+    Q_EMIT error(QStringLiteral("User Cancelled"));
 }
 
 void KAccountsUiProvider::onAccountCreated(Tp::PendingOperation *op)
@@ -421,6 +423,7 @@ void KAccountsUiProvider::onConfigureAccountFinished()
 void KAccountsUiProvider::onConfigureAccountDialogRejected()
 {
     d->dialog->reject();
+    Q_EMIT error(QStringLiteral("User Cancelled"));
 }
 
 void KAccountsUiProvider::storePasswordInSso(const quint32 accountId, const QString &password)

-- 
ktp-accounts-kcm packaging