Fix Qt4 compilation

And a typo
This commit is contained in:
Olivier Goffart 2014-03-27 18:19:56 +01:00
parent d6525a979d
commit 69fcbd3b0d
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@ void ShibbolethUserJob::start()
QNetworkRequest req;
req.setRawHeader("OCS-APIREQUEST", "true");
QUrl url = Account::concatUrlPath(account()->url(), path());
url.setQuery("format=json");
url.setQueryItems(QList<QPair<QString, QString> >() << qMakePair(QString::fromLatin1("format"), QString::fromLatin1("json")));
setReply(davRequest("GET", url, req));
setupConnections(reply());
AbstractNetworkJob::start();

View file

@ -292,7 +292,7 @@ void ShibbolethCredentials::slotUserFetched(const QString &user)
_user = user;
} else if (user != _user) {
qDebug() << "Wrong user: " << user << "!=" << _user;
QMessageBox::warning(_browser, tr("Login Error"), tr("You must log with user %1").arg(_user));
QMessageBox::warning(_browser, tr("Login Error"), tr("You must sign in as user %1").arg(_user));
invalidateToken(job->account());
showLoginWindow(job->account());
return;