Hello community, here is the log from the commit of package ktp-auth-handler for openSUSE:Factory checked in at 2015-10-03 20:24:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-auth-handler (Old) and /work/SRC/openSUSE:Factory/.ktp-auth-handler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-auth-handler" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-auth-handler/ktp-auth-handler.changes 2015-07-14 17:41:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-auth-handler.new/ktp-auth-handler.changes 2015-10-03 20:24:26.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 13 19:31:03 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:44:02 UTC 2015 - cgiboude...@gmx.com + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Fri Aug 7 07:10:08 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + +------------------------------------------------------------------- Old: ---- ktp-auth-handler-15.04.3.tar.xz New: ---- ktp-auth-handler-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-auth-handler.spec ++++++ --- /var/tmp/diff_new_pack.froUmt/_old 2015-10-03 20:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.froUmt/_new 2015-10-03 20:24:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktp-auth-handler -Version: 15.04.3 +Version: 15.08.1 Release: 0 Summary: Telepathy auth handler License: LGPL-2.1+ ++++++ ktp-auth-handler-15.04.3.tar.xz -> ktp-auth-handler-15.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/CMakeLists.txt new/ktp-auth-handler-15.08.1/CMakeLists.txt --- old/ktp-auth-handler-15.04.3/CMakeLists.txt 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/CMakeLists.txt 2015-09-10 00:57:06.000000000 +0200 @@ -1,6 +1,10 @@ project(ktp-auth-handler) -set(KTP_AUTH_HANDLER_VERSION "15.04.2") +# KDE Application Version, managed by release script +set(KDE_APPLICATIONS_VERSION_MAJOR "15") +set(KDE_APPLICATIONS_VERSION_MINOR "08") +set(KDE_APPLICATIONS_VERSION_MICRO "1") +set(KTP_AUTH_HANDLER_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) @@ -62,7 +66,6 @@ types.cpp x-telepathy-password-auth-operation.cpp x-telepathy-password-prompt.cpp - x-telepathy-sso-facebook-operation.cpp x-telepathy-sso-google-operation.cpp conference-auth-op.cpp conference-auth-observer.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/sasl-auth-op.cpp new/ktp-auth-handler-15.08.1/sasl-auth-op.cpp --- old/ktp-auth-handler-15.04.3/sasl-auth-op.cpp 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/sasl-auth-op.cpp 2015-09-10 00:57:06.000000000 +0200 @@ -21,7 +21,6 @@ #include "sasl-auth-op.h" #include "x-telepathy-password-auth-operation.h" -#include "x-telepathy-sso-facebook-operation.h" #include "x-telepathy-sso-google-operation.h" #include <QtCore/QScopedPointer> @@ -38,11 +37,13 @@ m_channel(channel), m_saslIface(channel->interface<Tp::Client::ChannelInterfaceSASLAuthenticationInterface>()) { - KSharedConfigPtr config = KSharedConfig::openConfig(QStringLiteral("kaccounts-ktprc")); - KConfigGroup ktpKaccountsGroup = config->group(QStringLiteral("ktp-kaccounts")); - m_kaccountsId = ktpKaccountsGroup.readEntry(account->objectPath()).toUInt(); + //Check if the account has any StorageIdentifier, in which case we will + //prioritize those mechanism related with KDE Accounts integration + QScopedPointer<Tp::Client::AccountInterfaceStorageInterface> accountStorageInterface( + new Tp::Client::AccountInterfaceStorageInterface(m_account->busName(), m_account->objectPath())); - setReady(); + Tp::PendingVariantMap *pendingMap = accountStorageInterface->requestAllProperties(); + connect(pendingMap, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGetAccountStorageFetched(Tp::PendingOperation*))); } SaslAuthOp::~SaslAuthOp() @@ -67,17 +68,9 @@ QString error = qdbus_cast<QString>(props.value(QLatin1String("SASLError"))); QVariantMap errorDetails = qdbus_cast<QVariantMap>(props.value(QLatin1String("SASLErrorDetails"))); - if (mechanisms.contains(QLatin1String("X-FACEBOOK-PLATFORM")) && m_kaccountsId != 0) { - qDebug() << "Starting Facebook OAuth auth"; - XTelepathySSOFacebookOperation *authop = new XTelepathySSOFacebookOperation(m_account, m_kaccountsId, m_saslIface); - connect(authop, - SIGNAL(finished(Tp::PendingOperation*)), - SLOT(onAuthOperationFinished(Tp::PendingOperation*))); - - authop->onSASLStatusChanged(status, error, errorDetails); - } else if (mechanisms.contains(QLatin1String("X-OAUTH2")) && m_kaccountsId != 0) { + if (mechanisms.contains(QLatin1String("X-OAUTH2"))) { qDebug() << "Starting X-OAuth2 auth"; - XTelepathySSOGoogleOperation *authop = new XTelepathySSOGoogleOperation(m_account, m_kaccountsId, m_saslIface); + XTelepathySSOGoogleOperation *authop = new XTelepathySSOGoogleOperation(m_account, m_accountStorageId, m_saslIface); connect(authop, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAuthOperationFinished(Tp::PendingOperation*))); @@ -86,17 +79,17 @@ } else if (mechanisms.contains(QLatin1String("X-TELEPATHY-PASSWORD"))) { qDebug() << "Starting Password auth"; Q_EMIT ready(this); - XTelepathyPasswordAuthOperation *authop = new XTelepathyPasswordAuthOperation(m_account, m_saslIface, qdbus_cast<bool>(props.value(QLatin1String("CanTryAgain")))); + XTelepathyPasswordAuthOperation *authop = new XTelepathyPasswordAuthOperation(m_account, m_accountStorageId, m_saslIface, qdbus_cast<bool>(props.value(QLatin1String("CanTryAgain")))); connect(authop, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAuthOperationFinished(Tp::PendingOperation*))); authop->onSASLStatusChanged(status, error, errorDetails); } else { - qWarning() << "X-TELEPATHY-PASSWORD, X-OAUTH2, X-FACEBOOK_PLATFORM are the only supported SASL mechanism and are not available:" << mechanisms; + qWarning() << "X-TELEPATHY-PASSWORD, X-OAUTH2 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-OAUTH2, X-FACEBOOK_PLATFORM are the only supported SASL mechanism and are not available:")); + QLatin1String("X-TELEPATHY-PASSWORD, X-OAUTH2 are the only supported SASL mechanism and are not available:")); return; } } @@ -117,3 +110,13 @@ SIGNAL(finished(Tp::PendingOperation*)), SLOT(gotProperties(Tp::PendingOperation*))); } + +void SaslAuthOp::onGetAccountStorageFetched(Tp::PendingOperation* op) +{ + Tp::PendingVariantMap *pendingMap = qobject_cast<Tp::PendingVariantMap*>(op); + + m_accountStorageId = pendingMap->result()["StorageIdentifier"].value<QDBusVariant>().variant().toInt(); + qDebug() << m_accountStorageId; + + setReady(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/sasl-auth-op.h new/ktp-auth-handler-15.08.1/sasl-auth-op.h --- old/ktp-auth-handler-15.04.3/sasl-auth-op.h 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/sasl-auth-op.h 2015-09-10 00:57:06.000000000 +0200 @@ -44,6 +44,7 @@ private Q_SLOTS: void gotProperties(Tp::PendingOperation *op); void onAuthOperationFinished(Tp::PendingOperation *op); + void onGetAccountStorageFetched(Tp::PendingOperation *op); private: void setReady(); @@ -51,7 +52,7 @@ Tp::AccountPtr m_account; Tp::ChannelPtr m_channel; Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface; - quint32 m_kaccountsId; + int m_accountStorageId; }; #endif // SASL_AUTH_OP_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-password-auth-operation.cpp new/ktp-auth-handler-15.08.1/x-telepathy-password-auth-operation.cpp --- old/ktp-auth-handler-15.04.3/x-telepathy-password-auth-operation.cpp 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-password-auth-operation.cpp 2015-09-10 00:57:06.000000000 +0200 @@ -39,13 +39,15 @@ XTelepathyPasswordAuthOperation::XTelepathyPasswordAuthOperation( const Tp::AccountPtr &account, + int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface, bool canTryAgain) : Tp::PendingOperation(account), m_account(account), m_saslIface(saslIface), m_canTryAgain(canTryAgain), - m_canFinish(false) + m_canFinish(false), + m_accountStorageId(accountStorageId) { connect(m_saslIface, SIGNAL(SASLStatusChanged(uint,QString,QVariantMap)), @@ -53,9 +55,6 @@ m_config = KSharedConfig::openConfig(QStringLiteral("kaccounts-ktprc")); m_lastLoginFailedConfig = m_config->group(QStringLiteral("lastLoginFailed")); - - KConfigGroup kaccountsGroup = m_config->group(QStringLiteral("ktp-kaccounts")); - m_kaccountsId = kaccountsGroup.readEntry(m_account->objectPath(), 0); } XTelepathyPasswordAuthOperation::~XTelepathyPasswordAuthOperation() @@ -70,8 +69,8 @@ // if we have non-null id AND if the last attempt didn't fail, // proceed with the credentials receieved from the SSO; // otherwise prompt the user - if (m_kaccountsId != 0 && !m_lastLoginFailedConfig.hasKey(m_account->objectPath())) { - GetCredentialsJob *credentialsJob = new GetCredentialsJob(m_kaccountsId, this); + if (!m_lastLoginFailedConfig.hasKey(m_account->objectPath())) { + GetCredentialsJob *credentialsJob = new GetCredentialsJob(m_accountStorageId, QStringLiteral("password"), QStringLiteral("password"), this); connect(credentialsJob, &GetCredentialsJob::finished, [this](KJob *job){ if (job->error()) { qWarning() << "Credentials job error:" << job->errorText(); @@ -170,7 +169,7 @@ { QString username = m_account->parameters().value(QStringLiteral("account")).toString(); Accounts::Manager *manager = KAccounts::accountsManager(); - Accounts::Account *account = manager->account(m_kaccountsId); + Accounts::Account *account = manager->account(m_accountStorageId); SignOn::Identity *identity; if (account) { @@ -220,17 +219,7 @@ account->sync(); connect(account, &Accounts::Account::synced, [=]() { - m_kaccountsId = account->id(); - - QString uid = m_account->objectPath(); - - KSharedConfigPtr kaccountsConfig = KSharedConfig::openConfig(QStringLiteral("kaccounts-ktprc")); - KConfigGroup ktpKaccountsGroup = kaccountsConfig->group(QStringLiteral("ktp-kaccounts")); - ktpKaccountsGroup.writeEntry(uid, account->id()); - - KConfigGroup kaccountsKtpGroup = kaccountsConfig->group(QStringLiteral("kaccounts-ktp")); - kaccountsKtpGroup.writeEntry(QString::number(account->id()), uid); - kaccountsConfig->sync(); + m_accountStorageId = account->id(); qDebug() << "Account credentials synchronisation finished"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-password-auth-operation.h new/ktp-auth-handler-15.08.1/x-telepathy-password-auth-operation.h --- old/ktp-auth-handler-15.04.3/x-telepathy-password-auth-operation.h 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-password-auth-operation.h 2015-09-10 00:57:06.000000000 +0200 @@ -34,6 +34,7 @@ public: explicit XTelepathyPasswordAuthOperation( const Tp::AccountPtr &account, + int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface, bool canTryAgain); ~XTelepathyPasswordAuthOperation(); @@ -50,7 +51,7 @@ Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface; KSharedConfigPtr m_config; KConfigGroup m_lastLoginFailedConfig; - quint32 m_kaccountsId; + int m_accountStorageId; bool m_canTryAgain; bool m_canFinish; QPointer<XTelepathyPasswordPrompt> m_dialog; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-sso-facebook-operation.cpp new/ktp-auth-handler-15.08.1/x-telepathy-sso-facebook-operation.cpp --- old/ktp-auth-handler-15.04.3/x-telepathy-sso-facebook-operation.cpp 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-sso-facebook-operation.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,102 +0,0 @@ -/* - Copyright (C) 2013 David Edmundson <k...@davidedmundson.co.uk> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "x-telepathy-sso-facebook-operation.h" - -#include <TelepathyQt/Account> -#include <TelepathyQt/ChannelInterfaceSASLAuthenticationInterface> -#include <TelepathyQt/AccountInterfaceStorageInterface> - -#include <TelepathyQt/PendingVariantMap> - -#include <Accounts/Account> -#include <KAccounts/getcredentialsjob.h> - -#include <QDebug> -#include <QUrlQuery> -#include <QUrl> - - -XTelepathySSOFacebookOperation::XTelepathySSOFacebookOperation(const Tp::AccountPtr &account, quint32 kaccountsId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface) - : PendingOperation(account), - m_account(account), - m_saslIface(saslIface), - m_kaccountsId(kaccountsId) -{ - Q_ASSERT(kaccountsId); - connect(m_saslIface, SIGNAL(SASLStatusChanged(uint,QString,QVariantMap)), SLOT(onSASLStatusChanged(uint,QString,QVariantMap))); - connect(m_saslIface, SIGNAL(NewChallenge(QByteArray)), SLOT(onNewChallenge(QByteArray))); -} - - -void XTelepathySSOFacebookOperation::onSASLStatusChanged(uint status, const QString &reason, const QVariantMap &details) -{ - qDebug() << "New status is: " << status; - qDebug() << "Details: " << details; - qDebug() << "Reason: " << reason; - - switch (status){ - case Tp::SASLStatusNotStarted: - { - qDebug() << "starting credentials job"; - m_saslIface->StartMechanism(QLatin1String("X-FACEBOOK-PLATFORM")); - break; - } - - case Tp::SASLStatusServerSucceeded: - qDebug() << "Authentication handshake"; - m_saslIface->AcceptSASL(); - break; - - case Tp::SASLStatusSucceeded: - qDebug() << "Authentication succeeded"; - setFinished(); - break; - } -} - -void XTelepathySSOFacebookOperation::onNewChallenge(const QByteArray& challengeData) -{ - m_challengeData = challengeData; - - GetCredentialsJob *job = new GetCredentialsJob(m_kaccountsId, this); - connect(job, SIGNAL(finished(KJob*)), SLOT(gotCredentials(KJob *))); - job->start(); -} - -void XTelepathySSOFacebookOperation::gotCredentials(KJob *kJob) -{ - qDebug(); - QUrl fbRequestUrl; - - fbRequestUrl.setQuery(m_challengeData); - QUrlQuery fbRequestQuery(fbRequestUrl); - QUrlQuery fbResponseQuery; - - qDebug() << fbRequestQuery.queryItemValue("version"); - - GetCredentialsJob *job = qobject_cast< GetCredentialsJob* >(kJob); - QVariantMap credentialsData = job->credentialsData(); - fbResponseQuery.addQueryItem("method", fbRequestQuery.queryItemValue("method")); - fbResponseQuery.addQueryItem("nonce", fbRequestQuery.queryItemValue("nonce")); - fbResponseQuery.addQueryItem("access_token", credentialsData["AccessToken"].toString()); - fbResponseQuery.addQueryItem("api_key", credentialsData["ClientId"].toString()); - fbResponseQuery.addQueryItem("call_id", "0"); - fbResponseQuery.addQueryItem("v", "1.0"); - - m_saslIface->Respond(fbResponseQuery.query().toUtf8()); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-sso-facebook-operation.h new/ktp-auth-handler-15.08.1/x-telepathy-sso-facebook-operation.h --- old/ktp-auth-handler-15.04.3/x-telepathy-sso-facebook-operation.h 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-sso-facebook-operation.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2013 David Edmundson <k...@davidedmundson.co.uk> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - - -#ifndef X_TELEPATHY_SSO_OPERATION_H -#define X_TELEPATHY_SSO_OPERATION_H - -#include <TelepathyQt/PendingOperation> -#include <TelepathyQt/Types> -#include <TelepathyQt/Channel> -#include <TelepathyQt/Account> - -class KJob; - -class XTelepathySSOFacebookOperation : public Tp::PendingOperation -{ - Q_OBJECT - Q_DISABLE_COPY(XTelepathySSOFacebookOperation) - -public: - explicit XTelepathySSOFacebookOperation( - const Tp::AccountPtr &account, - quint32 kaccountsId, - Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface); - -private Q_SLOTS: - void onSASLStatusChanged(uint status, const QString &reason, const QVariantMap &details); - void onNewChallenge(const QByteArray &challengeData); - void gotCredentials(KJob *kjob); - -private: - Tp::AccountPtr m_account; - Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface; - - quint32 m_kaccountsId; - QByteArray m_challengeData; - - friend class SaslAuthOp; -}; - -#endif // X_TELEPATHY_SSO_OPERATION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-sso-google-operation.cpp new/ktp-auth-handler-15.08.1/x-telepathy-sso-google-operation.cpp --- old/ktp-auth-handler-15.04.3/x-telepathy-sso-google-operation.cpp 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-sso-google-operation.cpp 2015-09-10 00:57:06.000000000 +0200 @@ -24,11 +24,12 @@ #include <KSharedConfig> #include <KConfigGroup> +#include <KLocalizedString> -XTelepathySSOGoogleOperation::XTelepathySSOGoogleOperation(const Tp::AccountPtr &account, quint32 kaccountsId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface) +XTelepathySSOGoogleOperation::XTelepathySSOGoogleOperation(const Tp::AccountPtr &account, int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface) : PendingOperation(account) , m_saslIface(saslIface) - , m_kaccountsId(kaccountsId) + , m_accountStorageId(accountStorageId) { connect(m_saslIface, SIGNAL(SASLStatusChanged(uint,QString,QVariantMap)), SLOT(onSASLStatusChanged(uint,QString,QVariantMap))); } @@ -39,7 +40,7 @@ case Tp::SASLStatusNotStarted: { qDebug() << "Status Not started"; - GetCredentialsJob *job = new GetCredentialsJob(m_kaccountsId, this); + GetCredentialsJob *job = new GetCredentialsJob(m_accountStorageId, QStringLiteral("oauth2"), QStringLiteral("web_server"), this); connect(job, SIGNAL(finished(KJob*)), SLOT(gotCredentials(KJob*))); job->start(); break; @@ -53,6 +54,13 @@ qDebug() << "Authentication succeeded"; setFinished(); break; + case Tp::SASLStatusServerFailed: + qDebug() << "Auth failed"; + QString errorMessage = details[QLatin1String("server-message")].toString(); + if (errorMessage.isEmpty()) { + errorMessage = details[QLatin1String("debug-message")].toString(); + } + setFinishedWithError(reason, errorMessage.isEmpty() ? i18n("Authentication error") : errorMessage); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-auth-handler-15.04.3/x-telepathy-sso-google-operation.h new/ktp-auth-handler-15.08.1/x-telepathy-sso-google-operation.h --- old/ktp-auth-handler-15.04.3/x-telepathy-sso-google-operation.h 2015-05-28 23:55:57.000000000 +0200 +++ new/ktp-auth-handler-15.08.1/x-telepathy-sso-google-operation.h 2015-09-10 00:57:06.000000000 +0200 @@ -35,7 +35,7 @@ public: explicit XTelepathySSOGoogleOperation( const Tp::AccountPtr &account, - quint32 kaccountsId, + int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface); private Q_SLOTS: @@ -46,7 +46,7 @@ Tp::AccountPtr m_account; Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface; - quint32 m_kaccountsId; + int m_accountStorageId; QByteArray m_challengeData; friend class SaslAuthOp;