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

The following commit has been merged in the master branch:
commit affa17853069c4518f06e1442f87a276ff056f7f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 16 18:40:33 2015 +0100

    [kaccounts] Don't send useless errors
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index e9e60dd..a7569cf 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -313,7 +313,7 @@ void KAccountsUiProvider::onCreateAccountDialogAccepted()
 void KAccountsUiProvider::onCreateAccountDialogRejected()
 {
     d->dialog->reject();
-    Q_EMIT error(QStringLiteral("User Cancelled"));
+    Q_EMIT error(QString());
 }
 
 void KAccountsUiProvider::onAccountCreated(Tp::PendingOperation *op)
@@ -428,7 +428,7 @@ void KAccountsUiProvider::onConfigureAccountFinished()
 void KAccountsUiProvider::onConfigureAccountDialogRejected()
 {
     d->dialog->reject();
-    Q_EMIT error(QStringLiteral("User Cancelled"));
+    Q_EMIT error(QString());
 }
 
 void KAccountsUiProvider::storePasswordInSso(const quint32 accountId, const QString &password)

-- 
ktp-accounts-kcm packaging