[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:59:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=2ed8231
The following commit has been merged in the master branch:
commit 2ed82311d2a6891845c5d674396e942c5c516123
Author: Martin Klapetek <mklapetek at kde.org>
Date: Thu Aug 21 16:01:05 2014 +0200
Port KDebug to QDebug
---
conference-auth-observer.cpp | 6 +++---
conference-auth-op.cpp | 9 +++++----
getcredentialsjob.cpp | 10 +++++-----
main.cpp | 4 ++--
sasl-auth-op.cpp | 12 ++++++------
sasl-handler.cpp | 4 ++--
tls-cert-verifier-op.cpp | 4 ++--
tls-handler.cpp | 4 ++--
x-messenger-oauth2-auth-operation.cpp | 19 ++++++++++---------
x-messenger-oauth2-prompt.cpp | 24 ++++++++++++------------
x-telepathy-password-auth-operation.cpp | 20 ++++++++++----------
x-telepathy-password-prompt.cpp | 2 +-
x-telepathy-sso-facebook-operation.cpp | 22 +++++++++++-----------
x-telepathy-sso-google-operation.cpp | 6 +++---
14 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/conference-auth-observer.cpp b/conference-auth-observer.cpp
index b21add5..c741a41 100644
--- a/conference-auth-observer.cpp
+++ b/conference-auth-observer.cpp
@@ -24,12 +24,12 @@
#include <KTp/telepathy-handler-application.h>
#include <QDBusConnection>
+#include <QDebug>
#include <TelepathyQt/Channel>
#include <TelepathyQt/ChannelDispatchOperation>
#include <TelepathyQt/MethodInvocationContext>
-#include <KDebug>
ConferenceAuthObserver::ConferenceAuthObserver(const Tp::ChannelClassSpecList &channelFilter)
: Tp::AbstractClientObserver(channelFilter)
@@ -55,7 +55,7 @@ void ConferenceAuthObserver::observeChannels(const Tp::MethodInvocationContextPt
Q_FOREACH (Tp::ChannelPtr channel, channels) {
if (!channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_PASSWORD)) {
- kDebug() << "Channel does not have password interface, exiting ...";
+ qDebug() << "Channel does not have password interface, exiting ...";
continue;
}
@@ -74,7 +74,7 @@ void ConferenceAuthObserver::observeChannels(const Tp::MethodInvocationContextPt
void ConferenceAuthObserver::onAuthFinished(Tp::PendingOperation *op)
{
if (op->isError()) {
- kWarning() << "Error in conference room auth:" << op->errorName() << "-" << op->errorMessage();
+ qWarning() << "Error in conference room auth:" << op->errorName() << "-" << op->errorMessage();
}
KTp::TelepathyHandlerApplication::jobFinished();
diff --git a/conference-auth-op.cpp b/conference-auth-op.cpp
index f3c36b0..e642a54 100644
--- a/conference-auth-op.cpp
+++ b/conference-auth-op.cpp
@@ -22,7 +22,8 @@
#include <TelepathyQt/PendingVariantMap>
-#include <KDebug>
+#include <QDebug>
+
#include <KLocalizedString>
#include <KPasswordDialog>
@@ -51,7 +52,7 @@ void ConferenceAuthOp::onOpenWalletOperationFinished(Tp::PendingOperation *op)
m_walletInterface = walletOp->walletInterface();
- kDebug() << "Wallet is open :" << m_walletInterface->isOpen();
+ qDebug() << "Wallet is open :" << m_walletInterface->isOpen();
QDBusPendingReply<uint> reply = m_passwordIface->GetPasswordFlags();
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
@@ -64,7 +65,7 @@ void ConferenceAuthOp::passwordFlagOperationFinished(QDBusPendingCallWatcher *wa
{
QDBusPendingReply<uint> reply = *watcher;
if (reply.isError()) {
- kWarning() << "Reply is a error. ABORT!";
+ qWarning() << "Reply is a error. ABORT!";
return;
}
@@ -110,7 +111,7 @@ void ConferenceAuthOp::onPasswordProvided(QDBusPendingCallWatcher *watcher)
m_walletInterface->setEntry(m_account,m_channel->targetId(), m_password);
setFinished();
} else {
- kDebug() << "Password was incorrect, enter again";
+ qDebug() << "Password was incorrect, enter again";
passwordDialog();
}
}
diff --git a/getcredentialsjob.cpp b/getcredentialsjob.cpp
index bdec74e..7016ede 100644
--- a/getcredentialsjob.cpp
+++ b/getcredentialsjob.cpp
@@ -25,7 +25,7 @@
#include <SignOn/Identity>
-#include <KDebug>
+#include <QDebug>
GetCredentialsJob::GetCredentialsJob(const Accounts::AccountId& id, QObject* parent)
: KJob(parent)
@@ -75,21 +75,21 @@ void GetCredentialsJob::getCredentials()
connect(authSession, SIGNAL(error(SignOn::Error)),
SLOT(sessionError(SignOn::Error)));
- kDebug() << authData.parameters();
- kDebug() << authData.mechanism();
+ qDebug() << authData.parameters();
+ qDebug() << authData.mechanism();
authSession->process(authData.parameters(), authData.mechanism());
}
void GetCredentialsJob::sessionResponse(const SignOn::SessionData& data)
{
- kDebug() << data.toMap();
+ qDebug() << data.toMap();
m_sessionData = data;
emitResult();
}
void GetCredentialsJob::sessionError(const SignOn::Error& error)
{
- kDebug() << error.message();
+ qDebug() << error.message();
setError(-1);
setErrorText(error.message());
emitResult();
diff --git a/main.cpp b/main.cpp
index c846502..19f4b07 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,7 +20,7 @@
#include <KAboutData>
#include <KCmdLineArgs>
#include <KApplication>
-#include <KDebug>
+#include <QDebug>
#include <TelepathyQt/AccountFactory>
#include <TelepathyQt/AccountManager>
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
}
if (loadedHandlers == 0) {
- kDebug() << "No handlers registered. Exiting";
+ qDebug() << "No handlers registered. Exiting";
return 1;
}
diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index adc2023..c54d662 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -32,7 +32,7 @@
#include <TelepathyQt/PendingVariantMap>
-#include <KDebug>
+#include <QDebug>
#include <KLocalizedString>
#include <KTp/wallet-interface.h>
@@ -61,7 +61,7 @@ SaslAuthOp::~SaslAuthOp()
void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
{
if (op->isError()) {
- kWarning() << "Unable to retrieve available SASL mechanisms";
+ qWarning() << "Unable to retrieve available SASL mechanisms";
m_channel->requestClose();
setFinishedWithError(op->errorName(), op->errorMessage());
return;
@@ -70,7 +70,7 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
Tp::PendingVariantMap *pvm = qobject_cast<Tp::PendingVariantMap*>(op);
QVariantMap props = qdbus_cast<QVariantMap>(pvm->result());
QStringList mechanisms = qdbus_cast<QStringList>(props.value(QLatin1String("AvailableMechanisms")));
- kDebug() << mechanisms;
+ qDebug() << mechanisms;
uint status = qdbus_cast<uint>(props.value(QLatin1String("SASLStatus")));
QString error = qdbus_cast<QString>(props.value(QLatin1String("SASLError")));
@@ -111,7 +111,7 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
authop->onSASLStatusChanged(status, error, errorDetails);
} else {
- kWarning() << "X-TELEPATHY-PASSWORD, X-MESSENGER-OAUTH2, X-OAUTH2, X-FACEBOOK_PLATFORM are the only supported SASL mechanism and are not available:" << mechanisms;
+ qWarning() << "X-TELEPATHY-PASSWORD, X-MESSENGER-OAUTH2, X-OAUTH2, X-FACEBOOK_PLATFORM are the only supported SASL mechanism and are not available:" << mechanisms;
m_channel->requestClose();
setFinishedWithError(TP_QT_ERROR_NOT_IMPLEMENTED,
QLatin1String("X-TELEPATHY-PASSWORD, X-MESSENGER-OAUTH2, X-OAUTH2, X-FACEBOOK_PLATFORM are the only supported SASL mechanism and are not available:"));
@@ -153,11 +153,11 @@ void SaslAuthOp::setReady()
#ifdef HAVE_SSO
void SaslAuthOp::onGetAccountStorageFetched(Tp::PendingOperation* op)
{
- kDebug();
+ qDebug();
Tp::PendingVariantMap *pendingMap = qobject_cast<Tp::PendingVariantMap*>(op);
m_accountStorageId = pendingMap->result()["StorageIdentifier"].value<QDBusVariant>().variant().toInt();
- kDebug() << m_accountStorageId;
+ qDebug() << m_accountStorageId;
setReady();
}
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index acc4559..c7b0c52 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -31,7 +31,7 @@
#include <TelepathyQt/ChannelDispatchOperation>
#include <TelepathyQt/MethodInvocationContext>
-#include <KDebug>
+#include <QDebug>
static inline Tp::ChannelClassSpecList channelFilter() {
Tp::ChannelClassSpecList filter;
@@ -101,7 +101,7 @@ void SaslHandler::onAuthFinished(Tp::PendingOperation *op)
Q_ASSERT(mAuthContexts.contains(auth));
if (op->isError()) {
- kWarning() << "Error in SASL auth:" << op->errorName() << "-" << op->errorMessage();
+ qWarning() << "Error in SASL auth:" << op->errorName() << "-" << op->errorMessage();
}
mAuthContexts.remove(auth);
diff --git a/tls-cert-verifier-op.cpp b/tls-cert-verifier-op.cpp
index ebe5129..00ae2b9 100644
--- a/tls-cert-verifier-op.cpp
+++ b/tls-cert-verifier-op.cpp
@@ -24,8 +24,8 @@
#include <KMessageBox>
#include <KLocalizedString>
-#include <KDebug>
+#include <QDebug>
#include <QSslCertificate>
#include <QSslCipher>
@@ -63,7 +63,7 @@ TlsCertVerifierOp::~TlsCertVerifierOp()
void TlsCertVerifierOp::gotProperties(Tp::PendingOperation *op)
{
if (op->isError()) {
- kWarning() << "Unable to retrieve properties from AuthenticationTLSCertificate object at" <<
+ qWarning() << "Unable to retrieve properties from AuthenticationTLSCertificate object at" <<
m_authTLSCertificateIface->path();
m_channel->requestClose();
setFinishedWithError(op->errorName(), op->errorMessage());
diff --git a/tls-handler.cpp b/tls-handler.cpp
index 7686192..e2994b5 100644
--- a/tls-handler.cpp
+++ b/tls-handler.cpp
@@ -30,7 +30,7 @@
#include <TelepathyQt/ChannelDispatchOperation>
#include <TelepathyQt/MethodInvocationContext>
-#include <KDebug>
+#include <QDebug>
static inline Tp::ChannelClassSpecList channelFilter() {
Tp::ChannelClassSpecList filter;
@@ -94,7 +94,7 @@ void TlsHandler::onCertVerifierFinished(Tp::PendingOperation *op)
Q_ASSERT(mVerifiers.contains(verifier));
if (op->isError()) {
- kWarning() << "Error verifying TLS certificate:" << op->errorName() << "-" << op->errorMessage();
+ qWarning() << "Error verifying TLS certificate:" << op->errorName() << "-" << op->errorMessage();
}
mVerifiers.remove(verifier);
diff --git a/x-messenger-oauth2-auth-operation.cpp b/x-messenger-oauth2-auth-operation.cpp
index e949729..8fec022 100644
--- a/x-messenger-oauth2-auth-operation.cpp
+++ b/x-messenger-oauth2-auth-operation.cpp
@@ -19,7 +19,8 @@
#include "x-messenger-oauth2-auth-operation.h"
#include <KUrl>
-#include <KDebug>
+#include <QDebug>
+
#include <KLocalizedString>
#include <TelepathyQt/Account>
#include <KTp/wallet-interface.h>
@@ -63,7 +64,7 @@ void XMessengerOAuth2AuthOperation::onSASLStatusChanged(uint status, const QStri
return;
}
- kDebug() << "Requesting password";
+ qDebug() << "Requesting password";
m_dialog = new XMessengerOAuth2Prompt();
connect(m_dialog.data(),
@@ -76,19 +77,19 @@ void XMessengerOAuth2AuthOperation::onSASLStatusChanged(uint status, const QStri
SLOT(show()));
break;
case Tp::SASLStatusServerSucceeded:
- kDebug() << "Authentication handshake";
+ qDebug() << "Authentication handshake";
m_saslIface->AcceptSASL();
break;
case Tp::SASLStatusSucceeded:
- kDebug() << "Authentication succeeded";
+ qDebug() << "Authentication succeeded";
setFinished();
break;
case Tp::SASLStatusInProgress:
- kDebug() << "Authenticating...";
+ qDebug() << "Authenticating...";
break;
case Tp::SASLStatusServerFailed:
{
- kDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
+ qDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
if (m_walletInterface->hasEntry(m_account, XMessengerOAuth2AccessTokenWalletEntry)) {
// We cannot try again (TODO canTryAgain seems to be always false for
// X-MESSENGER-OAUTH but we should insert a check here)
@@ -107,7 +108,7 @@ void XMessengerOAuth2AuthOperation::onSASLStatusChanged(uint status, const QStri
break;
}
default:
- kWarning() << "Unhandled status" << status;
+ qWarning() << "Unhandled status" << status;
Q_ASSERT(false);
break;
}
@@ -117,7 +118,7 @@ void XMessengerOAuth2AuthOperation::onDialogFinished(int result)
{
switch (result) {
case QDialog::Rejected:
- kDebug() << "Authentication cancelled";
+ qDebug() << "Authentication cancelled";
m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, i18n("User cancelled auth"));
setFinished();
if (!m_dialog.isNull()) {
@@ -125,7 +126,7 @@ void XMessengerOAuth2AuthOperation::onDialogFinished(int result)
}
return;
case QDialog::Accepted:
- kDebug() << QLatin1String(m_dialog.data()->accessToken());
+ qDebug() << QLatin1String(m_dialog.data()->accessToken());
m_walletInterface->setEntry(m_account, XMessengerOAuth2AccessTokenWalletEntry, QLatin1String(m_dialog.data()->accessToken().toBase64()));
m_walletInterface->setEntry(m_account, XMessengerOAuth2RefreshTokenWalletEntry, QLatin1String(m_dialog.data()->refreshToken().toBase64()));
m_saslIface->StartMechanismWithData(QLatin1String("X-MESSENGER-OAUTH2"), m_dialog.data()->accessToken());
diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index 603b99b..8c1792f 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -21,7 +21,6 @@
#include <KUrl>
#include <KIcon>
#include <KToolInvocation>
-#include <KDebug>
#include <KWebView>
#include <KWebPage>
@@ -29,6 +28,7 @@
#include <QtGui/QBoxLayout>
#include <QtGui/QLayout>
#include <QtNetwork/QNetworkReply>
+#include <QDebug>
#include <QtWebKit/QWebSettings>
#include <QtWebKit/QWebFrame>
@@ -133,18 +133,18 @@ QSize XMessengerOAuth2Prompt::sizeHint() const
void XMessengerOAuth2Prompt::onUrlChanged(const QUrl &url)
{
- kDebug() << url;
+ qDebug() << url;
if (url.toString().indexOf(redirectUri) != 0) {
// This is not the url containing the token
return;
}
- kDebug() << "This is the url we are waiting for";
+ qDebug() << "This is the url we are waiting for";
extractCode(url);
}
void XMessengerOAuth2Prompt::onLinkClicked(const QUrl& url)
{
- kDebug() << url;
+ qDebug() << url;
KToolInvocation::invokeBrowser(url.toString());
}
@@ -169,7 +169,7 @@ void XMessengerOAuth2Prompt::onUnsupportedContent(QNetworkReply* reply)
// request
// FIXME: In the future this might want to remove this
QUrl url = reply->url();
- kDebug() << url;
+ qDebug() << url;
if (url.toString().indexOf(redirectUri) != 0) {
// This is not the url containing the token
return;
@@ -179,16 +179,16 @@ void XMessengerOAuth2Prompt::onUnsupportedContent(QNetworkReply* reply)
void XMessengerOAuth2Prompt::extractCode(const QUrl &url)
{
- kDebug() << url;
QString code = url.queryItemValue(codeParameter);
+ qDebug() << url;
if (code.isEmpty()) {
// Could not find the access token
- kWarning() << "Code not found";
+ qWarning() << "Code not found";
return;
}
- kDebug() << "Code found:" << code;
+ qDebug() << "Code found:" << code;
// start loading the login URL
KUrl tokenUrl(QString(tokenRequest).arg(msnClientID).arg(redirectUri).arg(code));
@@ -198,20 +198,20 @@ void XMessengerOAuth2Prompt::extractCode(const QUrl &url)
void XMessengerOAuth2Prompt::extractTokens(const QString &text)
{
- kDebug() << text;
+ qDebug() << text;
QJson::Parser parser;
bool ok;
QVariantMap result = parser.parse(text.toLatin1(), &ok).toMap();
if (!ok) {
- kWarning() << "An error occured during parsing reply";
+ qWarning() << "An error occured during parsing reply";
return;
}
if (!result.contains(refreshTokenParameter)) {
// Could not find the refresh token
- kWarning() << "Refresh token not found";
+ qWarning() << "Refresh token not found";
return;
}
@@ -220,7 +220,7 @@ void XMessengerOAuth2Prompt::extractTokens(const QString &text)
if (!result.contains(accessTokenParameter)) {
// Could not find the access token
- kWarning() << "Access token not found";
+ qWarning() << "Access token not found";
return;
}
diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index e2c8826..f999748 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -22,7 +22,7 @@
#include "x-telepathy-password-auth-operation.h"
#include "x-telepathy-password-prompt.h"
-#include <KDebug>
+#include <QDebug>
#include <KLocalizedString>
#include <KTp/wallet-interface.h>
@@ -51,27 +51,27 @@ void XTelepathyPasswordAuthOperation::onSASLStatusChanged(uint status, const QSt
const QVariantMap &details)
{
if (status == Tp::SASLStatusNotStarted) {
- kDebug() << "Requesting password";
+ qDebug() << "Requesting password";
promptUser(m_canTryAgain || !m_walletInterface->hasEntry(m_account, QLatin1String("lastLoginFailed")));
} else if (status == Tp::SASLStatusServerSucceeded) {
- kDebug() << "Authentication handshake";
+ qDebug() << "Authentication handshake";
m_saslIface->AcceptSASL();
} else if (status == Tp::SASLStatusSucceeded) {
- kDebug() << "Authentication succeeded";
+ qDebug() << "Authentication succeeded";
if (m_walletInterface->hasEntry(m_account, QLatin1String("lastLoginFailed"))) {
m_walletInterface->removeEntry(m_account, QLatin1String("lastLoginFailed"));
}
setFinished();
} else if (status == Tp::SASLStatusInProgress) {
- kDebug() << "Authenticating...";
+ qDebug() << "Authenticating...";
} else if (status == Tp::SASLStatusServerFailed) {
- kDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
+ qDebug() << "Error authenticating - reason:" << reason << "- details:" << details;
if (m_canTryAgain) {
- kDebug() << "Retrying...";
+ qDebug() << "Retrying...";
promptUser(false);
} else {
- kWarning() << "Authentication failed and cannot try again";
+ qWarning() << "Authentication failed and cannot try again";
m_walletInterface->setEntry(m_account, QLatin1String("lastLoginFailed"), QLatin1String("true"));
// We cannot try again, but we can request again to set the account
// online. A new channel will be created, but since we set the
@@ -104,7 +104,7 @@ void XTelepathyPasswordAuthOperation::onDialogFinished(int result)
{
switch (result) {
case QDialog::Rejected:
- kDebug() << "Authentication cancelled";
+ qDebug() << "Authentication cancelled";
m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, i18n("User cancelled auth"));
setFinished();
if (!m_dialog.isNull()) {
@@ -115,7 +115,7 @@ void XTelepathyPasswordAuthOperation::onDialogFinished(int result)
// save password in kwallet if necessary...
if (!m_dialog.isNull()) {
if (m_dialog.data()->savePassword()) {
- kDebug() << "Saving password in wallet";
+ qDebug() << "Saving password in wallet";
m_walletInterface->setPassword(m_account, m_dialog.data()->password());
}
m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), m_dialog.data()->password().toUtf8());
diff --git a/x-telepathy-password-prompt.cpp b/x-telepathy-password-prompt.cpp
index 896b176..1afeb75 100644
--- a/x-telepathy-password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -22,7 +22,7 @@
#include <KTp/wallet-interface.h>
#include <KIcon>
-#include <KDebug>
+#include <QDebug>
XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account, KTp::WalletInterface *walletInterface, QWidget *parent)
: KDialog(parent),
diff --git a/x-telepathy-sso-facebook-operation.cpp b/x-telepathy-sso-facebook-operation.cpp
index 69d8786..82c47b6 100644
--- a/x-telepathy-sso-facebook-operation.cpp
+++ b/x-telepathy-sso-facebook-operation.cpp
@@ -26,8 +26,8 @@
#include <Accounts/Account>
-#include <KDebug>
#include <KUrl>
+#include <QDebug>
#include "getcredentialsjob.h"
@@ -45,19 +45,19 @@ XTelepathySSOFacebookOperation::XTelepathySSOFacebookOperation(const Tp::Account
void XTelepathySSOFacebookOperation::onSASLStatusChanged(uint status, const QString &reason, const QVariantMap &details)
{
- kDebug() << "New status is: " << status;
- kDebug() << "Details: " << details;
- kDebug() << "Reason: " << reason;
+ qDebug() << "New status is: " << status;
+ qDebug() << "Details: " << details;
+ qDebug() << "Reason: " << reason;
switch (status){
case Tp::SASLStatusNotStarted:
{
- kDebug() << "starting credentials job";
+ qDebug() << "starting credentials job";
m_saslIface->StartMechanism(QLatin1String("X-FACEBOOK-PLATFORM"));
break;
}
case Tp::SASLStatusServerSucceeded:
- kDebug() << "Authentication handshake";
+ qDebug() << "Authentication handshake";
m_saslIface->AcceptSASL();
break;
}
@@ -65,11 +65,11 @@ void XTelepathySSOFacebookOperation::onSASLStatusChanged(uint status, const QStr
void XTelepathySSOFacebookOperation::onNewChallenge(const QByteArray& challengeData)
{
- kDebug() << "New Challenge" << challengeData;
+ qDebug() << "New Challenge" << challengeData;
m_challengeData = challengeData;
- kDebug() << "GetCredentialsJob on account: " << m_accountStorageId;
+ qDebug() << "GetCredentialsJob on account: " << m_accountStorageId;
GetCredentialsJob *job = new GetCredentialsJob(m_accountStorageId, this);
connect(job, SIGNAL(finished(KJob*)), SLOT(gotCredentials(KJob *)));
job->start();
@@ -77,12 +77,12 @@ void XTelepathySSOFacebookOperation::onNewChallenge(const QByteArray& challengeD
void XTelepathySSOFacebookOperation::gotCredentials(KJob *kJob)
{
- kDebug();
KUrl fbRequestUrl;
KUrl fbResponseUrl;
+ qDebug();
fbRequestUrl.setQuery(m_challengeData);
- kDebug() << fbRequestUrl.queryItemValue("version");
+ qDebug() << fbRequestQuery.queryItemValue("version");
GetCredentialsJob *job = qobject_cast< GetCredentialsJob* >(kJob);
QVariantMap credentialsData = job->credentialsData();
@@ -94,6 +94,6 @@ void XTelepathySSOFacebookOperation::gotCredentials(KJob *kJob)
fbResponseUrl.addQueryItem("v", "1.0");
//.mid(1) trims leading '?' char
- kDebug() << fbResponseUrl.query().mid(1);
m_saslIface->Respond(fbResponseUrl.query().mid(1).toUtf8());
+ qDebug() << fbResponseQuery.query().mid(1);
}
diff --git a/x-telepathy-sso-google-operation.cpp b/x-telepathy-sso-google-operation.cpp
index 4b9d67d..f678916 100644
--- a/x-telepathy-sso-google-operation.cpp
+++ b/x-telepathy-sso-google-operation.cpp
@@ -20,7 +20,7 @@
#include "getcredentialsjob.h"
#include "x-telepathy-sso-google-operation.h"
-#include <KDebug>
+#include <QDebug>
XTelepathySSOGoogleOperation::XTelepathySSOGoogleOperation(const Tp::AccountPtr& account, int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface* saslIface)
: PendingOperation(account)
@@ -36,14 +36,14 @@ void XTelepathySSOGoogleOperation::onSASLStatusChanged(uint status, const QStrin
switch (status){
case Tp::SASLStatusNotStarted:
{
- kDebug() << "Status Not started";
+ qDebug() << "Status Not started";
GetCredentialsJob *job = new GetCredentialsJob(m_accountStorageId, this);
connect(job, SIGNAL(finished(KJob*)), SLOT(gotCredentials(KJob*)));
job->start();
break;
}
case Tp::SASLStatusServerSucceeded:
- kDebug() << "Status Server Succeeded";
+ qDebug() << "Status Server Succeeded";
m_saslIface->AcceptSASL();
break;
}
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list