[Pkg-owncloud-commits] [owncloud-client] 17/30: Keep the rentrency flag when asking the user for the password

[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 60a1d50ec963d360beb2f67fbd0d3bd1265401bc
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Mar 3 17:16:57 2014 +0100

    Keep the rentrency flag when asking the user for the password
---
 src/creds/httpcredentials.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp
index 1e18a35..050be60 100644
--- a/src/creds/httpcredentials.cpp
+++ b/src/creds/httpcredentials.cpp
@@ -234,8 +234,6 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
     _password = readJob->textData();
     Account *account = qvariant_cast<Account*>(readJob->property("account"));
 
-    _fetchJobInProgress = false;
-
     if( _user.isEmpty()) {
         qDebug() << "Strange: User is empty!";
     }
@@ -243,6 +241,8 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
     QKeychain::Error error = job->error();
 
     if( !_password.isEmpty() && error == NoError ) {
+        _fetchJobInProgress = false;
+
         // All cool, the keychain did not come back with error.
         // Still, the password can be empty which indicates a problem and
         // the password dialog has to be opened.
@@ -254,6 +254,7 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
         }
         bool ok;
         QString pwd = queryPassword(&ok);
+        _fetchJobInProgress = false;
         if (ok) {
             _password = pwd;
             _ready = true;

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