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

The following commit has been merged in the master branch:
commit fbc7f93759b888c396561d9586acfbe52cc13afe
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue May 26 20:56:17 2015 +0200

    [kaccounts] Add 4d9dfcc1d47b5b99e822148650b36dffbc10da26 from master
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index 29fcb10..af916d8 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -227,7 +227,8 @@ void KAccountsUiProvider::onConnectionManagerReady(Tp::PendingOperation*)
 
     QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, d->dialog);
     connect(dbb, &QDialogButtonBox::accepted, this, &KAccountsUiProvider::onCreateAccountDialogAccepted);
-    connect(dbb, &QDialogButtonBox::rejected, this, &KAccountsUiProvider::onCreateAccountDialogRejected);
+    connect(dbb, &QDialogButtonBox::rejected, d->dialog, &QDialog::reject);
+    connect(d->dialog, &QDialog::rejected, this, &KAccountsUiProvider::onCreateAccountDialogRejected);
 
     mainLayout->addWidget(d->accountEditWidget);
     mainLayout->addWidget(dbb);
@@ -279,7 +280,8 @@ void KAccountsUiProvider::showConfigureAccountDialog(const quint32 accountId)
 
     QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, d->dialog);
     connect(dbb, &QDialogButtonBox::accepted, this, &KAccountsUiProvider::onConfigureAccountDialogAccepted);
-    connect(dbb, &QDialogButtonBox::rejected, this, &KAccountsUiProvider::onConfigureAccountDialogRejected);
+    connect(dbb, &QDialogButtonBox::rejected, d->dialog, &QDialog::reject);
+    connect(d->dialog, &QDialog::rejected, this, &KAccountsUiProvider::onConfigureAccountDialogRejected);
 
     if (passwordParameter.isValid()) {
         QModelIndex index = parameterModel->indexForParameter(passwordParameter);
@@ -352,7 +354,6 @@ void KAccountsUiProvider::onCreateAccountDialogAccepted()
 void KAccountsUiProvider::onCreateAccountDialogRejected()
 {
     Q_EMIT error(QString());
-    d->dialog->reject();
 }
 
 void KAccountsUiProvider::onConfigureAccountDialogAccepted()
@@ -428,7 +429,6 @@ void KAccountsUiProvider::onConfigureAccountFinished()
 void KAccountsUiProvider::onConfigureAccountDialogRejected()
 {
     Q_EMIT error(QString());
-    d->dialog->reject();
 }
 
 void KAccountsUiProvider::storePasswordInSso(const quint32 accountId, const QString &password)

-- 
ktp-accounts-kcm packaging