[Pkg-owncloud-commits] [owncloud-client] 250/333: Fix Qt4 compilation

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 69fcbd3b0dda2fcaafbc54ffca80283f92f9e09b
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Mar 27 18:19:56 2014 +0100

    Fix Qt4 compilation
    
    And a typo
---
 src/creds/shibboleth/shibbolethuserjob.cpp | 2 +-
 src/creds/shibbolethcredentials.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/creds/shibboleth/shibbolethuserjob.cpp b/src/creds/shibboleth/shibbolethuserjob.cpp
index 56be57b..d64fd26 100644
--- a/src/creds/shibboleth/shibbolethuserjob.cpp
+++ b/src/creds/shibboleth/shibbolethuserjob.cpp
@@ -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();
diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 96ac753..57ea986 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git