[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:58:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=5667507
The following commit has been merged in the master branch:
commit 5667507e3e2c527937f950966a8bf7b163c2cf60
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 18:18:11 2011 +0100
Fix style
---
main.cpp | 3 +-
sasl-auth-op.cpp | 14 ++--
x-messenger-oauth2-auth-operation.cpp | 116 ++++++++++++++++----------------
x-messenger-oauth2-prompt.cpp | 2 +-
x-telepathy-password-auth-operation.cpp | 36 +++++-----
x-telepathy-password-prompt.cpp | 4 +-
6 files changed, 87 insertions(+), 88 deletions(-)
diff --git a/main.cpp b/main.cpp
index d010c15..4f9049a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -90,8 +90,7 @@ int main(int argc, char *argv[])
handlers -= 1;
}
- if (!handlers)
- {
+ if (!handlers) {
kDebug() << "No handlers registered. Exiting";
return 1;
}
diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index 1b46725..01385d5 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -62,9 +62,9 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
// everything ok, we can return from handleChannels now
emit ready(this);
XTelepathyPasswordAuthOperation *authop = new XTelepathyPasswordAuthOperation(m_account, m_saslIface, qdbus_cast<bool>(props.value("CanTryAgain")));
- connect (authop,
- SIGNAL(finished(Tp::PendingOperation*)),
- SLOT(onAuthOperationFinished(Tp::PendingOperation*)));
+ connect(authop,
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onAuthOperationFinished(Tp::PendingOperation*)));
uint status = qdbus_cast<uint>(props.value("SASLStatus"));
QString error = qdbus_cast<QString>(props.value("SASLError"));
QVariantMap errorDetails = qdbus_cast<QVariantMap>(props.value("SASLErrorDetails"));
@@ -73,9 +73,9 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
// everything ok, we can return from handleChannels now
emit ready(this);
XMessengerOAuth2AuthOperation *authop = new XMessengerOAuth2AuthOperation(m_account, m_saslIface);
- connect (authop,
- SIGNAL(finished(Tp::PendingOperation*)),
- SLOT(onAuthOperationFinished(Tp::PendingOperation*)));
+ connect(authop,
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onAuthOperationFinished(Tp::PendingOperation*)));
uint status = qdbus_cast<uint>(props.value("SASLStatus"));
QString error = qdbus_cast<QString>(props.value("SASLError"));
QVariantMap errorDetails = qdbus_cast<QVariantMap>(props.value("SASLErrorDetails"));
@@ -92,7 +92,7 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
void SaslAuthOp::onAuthOperationFinished(Tp::PendingOperation *op)
{
m_channel->requestClose();
- if(op->isError()) {
+ if (op->isError()) {
setFinishedWithError(op->errorName(), op->errorMessage());
} else {
setFinished();
diff --git a/x-messenger-oauth2-auth-operation.cpp b/x-messenger-oauth2-auth-operation.cpp
index 03e96ce..4976f0e 100644
--- a/x-messenger-oauth2-auth-operation.cpp
+++ b/x-messenger-oauth2-auth-operation.cpp
@@ -48,47 +48,47 @@ void XMessengerOAuth2AuthOperation::onSASLStatusChanged(uint status, const QStri
KTp::WalletInterface wallet(0);
switch (status) {
- case Tp::SASLStatusNotStarted :
- if (wallet.hasEntry(m_account, XMessengerOAuth2TokenWalletEntry)) {
- m_saslIface->StartMechanismWithData(QLatin1String("X-MESSENGER-OAUTH2"),
- QByteArray::fromBase64(wallet.entry(m_account, XMessengerOAuth2TokenWalletEntry).toLatin1()));
- return;
- }
+ case Tp::SASLStatusNotStarted :
+ if (wallet.hasEntry(m_account, XMessengerOAuth2TokenWalletEntry)) {
+ m_saslIface->StartMechanismWithData(QLatin1String("X-MESSENGER-OAUTH2"),
+ QByteArray::fromBase64(wallet.entry(m_account, XMessengerOAuth2TokenWalletEntry).toLatin1()));
+ return;
+ }
- kDebug() << "Requesting password";
- m_dialog = new XMessengerOAuth2Prompt();
+ kDebug() << "Requesting password";
+ m_dialog = new XMessengerOAuth2Prompt();
- connect(m_dialog.data(),
- SIGNAL(finished(int)),
- SLOT(onDialogFinished(int)));
- // Show the dialog only when the login page is loaded
- connect(m_dialog.data(),
- SIGNAL(loginPageLoaded(bool)),
- m_dialog.data(),
- SLOT(show()));
- break;
- case Tp::SASLStatusServerSucceeded:
- kDebug() << "Authentication handshake";
- m_saslIface->AcceptSASL();
- break;
- case Tp::SASLStatusSucceeded:
- kDebug() << "Authentication succeeded";
- setFinished();
- break;
- case Tp::SASLStatusInProgress:
- kDebug() << "Authenticating...";
- break;
- case Tp::SASLStatusServerFailed:
- {
- kDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
- QString errorMessage = details[QLatin1String("server-message")].toString();
- setFinishedWithError(reason, errorMessage.isEmpty() ? i18n("Authentication error") : errorMessage);
- break;
- }
- default:
- kWarning() << "Unhandled status" << status;
- Q_ASSERT(false);
- break;
+ connect(m_dialog.data(),
+ SIGNAL(finished(int)),
+ SLOT(onDialogFinished(int)));
+ // Show the dialog only when the login page is loaded
+ connect(m_dialog.data(),
+ SIGNAL(loginPageLoaded(bool)),
+ m_dialog.data(),
+ SLOT(show()));
+ break;
+ case Tp::SASLStatusServerSucceeded:
+ kDebug() << "Authentication handshake";
+ m_saslIface->AcceptSASL();
+ break;
+ case Tp::SASLStatusSucceeded:
+ kDebug() << "Authentication succeeded";
+ setFinished();
+ break;
+ case Tp::SASLStatusInProgress:
+ kDebug() << "Authenticating...";
+ break;
+ case Tp::SASLStatusServerFailed:
+ {
+ kDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
+ QString errorMessage = details[QLatin1String("server-message")].toString();
+ setFinishedWithError(reason, errorMessage.isEmpty() ? i18n("Authentication error") : errorMessage);
+ break;
+ }
+ default:
+ kWarning() << "Unhandled status" << status;
+ Q_ASSERT(false);
+ break;
}
}
@@ -96,25 +96,25 @@ void XMessengerOAuth2AuthOperation::onDialogFinished(int result)
{
KTp::WalletInterface wallet(0);
switch (result) {
- case QDialog::Rejected:
- kDebug() << "Authentication cancelled";
- m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
- setFinished();
- if (!m_dialog.isNull()) {
- m_dialog.data()->deleteLater();
- }
- return;
- case QDialog::Accepted:
- kDebug() << QLatin1String(m_dialog.data()->accessToken());
- wallet.setEntry(m_account, XMessengerOAuth2TokenWalletEntry, m_dialog.data()->accessToken().toBase64());
- m_saslIface->StartMechanismWithData(QLatin1String("X-MESSENGER-OAUTH2"), m_dialog.data()->accessToken());
- if (!m_dialog.isNull()) {
- m_dialog.data()->deleteLater();
- }
- return;
- default:
- Q_ASSERT(false);
- break;
+ case QDialog::Rejected:
+ kDebug() << "Authentication cancelled";
+ m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
+ setFinished();
+ if (!m_dialog.isNull()) {
+ m_dialog.data()->deleteLater();
+ }
+ return;
+ case QDialog::Accepted:
+ kDebug() << QLatin1String(m_dialog.data()->accessToken());
+ wallet.setEntry(m_account, XMessengerOAuth2TokenWalletEntry, m_dialog.data()->accessToken().toBase64());
+ m_saslIface->StartMechanismWithData(QLatin1String("X-MESSENGER-OAUTH2"), m_dialog.data()->accessToken());
+ if (!m_dialog.isNull()) {
+ m_dialog.data()->deleteLater();
+ }
+ return;
+ default:
+ Q_ASSERT(false);
+ break;
}
}
diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index f80259d..fee8db2 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -155,7 +155,7 @@ void XMessengerOAuth2Prompt::onUnsupportedContent(QNetworkReply* reply)
void XMessengerOAuth2Prompt::extractToken(const QUrl &url)
{
QString accessToken;
- Q_FOREACH(const QString &token, QString(url.encodedFragment()).split('&')) {
+ Q_FOREACH (const QString &token, QString(url.encodedFragment()).split('&')) {
// Get the URL fragment part and iterate over the parameters of the request
if (token.indexOf(tokenParameter) == 0) {
// This is the token that we are looking for (we are not interested
diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index 9598dd9..917647d 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -51,7 +51,7 @@ void XTelepathyPasswordAuthOperation::onSASLStatusChanged(uint status, const QSt
KTp::WalletInterface wallet(0);
if (status == Tp::SASLStatusNotStarted) {
kDebug() << "Requesting password";
- promptUser (m_canTryAgain || !wallet.hasEntry(m_account, QLatin1String("lastLoginFailed")));
+ promptUser(m_canTryAgain || !wallet.hasEntry(m_account, QLatin1String("lastLoginFailed")));
} else if (status == Tp::SASLStatusServerSucceeded) {
kDebug() << "Authentication handshake";
m_saslIface->AcceptSASL();
@@ -94,8 +94,8 @@ void XTelepathyPasswordAuthOperation::promptUser(bool isFirstRun)
} else {
m_dialog = new XTelepathyPasswordPrompt(m_account);
connect(m_dialog.data(),
- SIGNAL(finished(int)),
- SLOT(onDialogFinished(int)));
+ SIGNAL(finished(int)),
+ SLOT(onDialogFinished(int)));
m_dialog.data()->show();
}
}
@@ -104,24 +104,24 @@ void XTelepathyPasswordAuthOperation::onDialogFinished(int result)
{
KTp::WalletInterface wallet(0);
switch (result) {
- case QDialog::Rejected:
- kDebug() << "Authentication cancelled";
- m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
- setFinished();
+ case QDialog::Rejected:
+ kDebug() << "Authentication cancelled";
+ m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
+ setFinished();
+ if (!m_dialog.isNull()) {
+ m_dialog.data()->deleteLater();
+ }
+ return;
+ case QDialog::Accepted:
+ // save password in kwallet if necessary...
+ if (m_dialog.data()->savePassword()) {
+ kDebug() << "Saving password in wallet";
+ wallet.setPassword(m_account, m_dialog.data()->password());
+ m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), m_dialog.data()->password().toUtf8());
if (!m_dialog.isNull()) {
m_dialog.data()->deleteLater();
}
- return;
- case QDialog::Accepted:
- // save password in kwallet if necessary...
- if (m_dialog.data()->savePassword()) {
- kDebug() << "Saving password in wallet";
- wallet.setPassword(m_account, m_dialog.data()->password());
- m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), m_dialog.data()->password().toUtf8());
- if (!m_dialog.isNull()) {
- m_dialog.data()->deleteLater();
- }
- }
+ }
}
}
diff --git a/x-telepathy-password-prompt.cpp b/x-telepathy-password-prompt.cpp
index 328d2dd..3b62e74 100644
--- a/x-telepathy-password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -33,8 +33,8 @@ XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account
setWindowIcon(KIcon("telepathy-kde"));
ui->accountName->setText(account->displayName());
- ui->accountIcon->setPixmap(KIcon("dialog-password").pixmap(60,60));
- ui->title->setPixmap(KIcon(account->iconName()).pixmap(22,22));
+ ui->accountIcon->setPixmap(KIcon("dialog-password").pixmap(60, 60));
+ ui->title->setPixmap(KIcon(account->iconName()).pixmap(22, 22));
KTp::WalletInterface wallet(this->effectiveWinId());
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list