[Pkg-owncloud-commits] [owncloud-client] 62/83: Fix the sib window re-appearing.

[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 ce9bfd319a9babef6c1400179d481747ff88b714
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed May 28 10:18:57 2014 +0200

    Fix the sib window re-appearing.
    
    When the windows is accepted, do not emit fetched which means the process is finished
    one must first check the username is valid
---
 src/creds/shibboleth/shibbolethwebview.cpp | 1 -
 src/creds/shibboleth/shibbolethwebview.h   | 1 -
 src/creds/shibbolethcredentials.cpp        | 7 ++-----
 src/creds/shibbolethcredentials.h          | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/creds/shibboleth/shibbolethwebview.cpp b/src/creds/shibboleth/shibbolethwebview.cpp
index 91e7362..f94f764 100644
--- a/src/creds/shibboleth/shibbolethwebview.cpp
+++ b/src/creds/shibboleth/shibbolethwebview.cpp
@@ -119,7 +119,6 @@ void ShibbolethWebView::slotHandleAuthentication(QNetworkReply *reply, QAuthenti
 void ShibbolethWebView::accept()
 {
     _accepted = true;
-    Q_EMIT accepted();
 }
 
 } // ns Mirall
diff --git a/src/creds/shibboleth/shibbolethwebview.h b/src/creds/shibboleth/shibbolethwebview.h
index fc96508..c002e7e 100644
--- a/src/creds/shibboleth/shibbolethwebview.h
+++ b/src/creds/shibboleth/shibbolethwebview.h
@@ -41,7 +41,6 @@ public:
 
 Q_SIGNALS:
   void shibbolethCookieReceived(const QNetworkCookie &cookie, Account *account);
-  void accepted();
   void rejected();
 
 private Q_SLOTS:
diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index a087c45..7efc92e 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -269,7 +269,7 @@ void ShibbolethCredentials::slotUserFetched(const QString &user)
 }
 
 
-void ShibbolethCredentials::slotBrowserAccepted()
+void ShibbolethCredentials::slotBrowserRejected()
 {
     _ready = false;
     Q_EMIT fetched();
@@ -341,10 +341,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
     _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, Account*)),
             this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*)));
-    connect(_browser, SIGNAL(accepted()),
-            this, SLOT(slotBrowserAccepted()));
-    // FIXME If the browser was hidden (e.g. user closed it) without us logging in, the logic gets stuck
-    // and can only be unstuck by restarting the app or pressing "Sign in" (we should switch to offline but we don't)
+    connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));
 
     _browser->show();
 }
diff --git a/src/creds/shibbolethcredentials.h b/src/creds/shibbolethcredentials.h
index 5bcd244..53c8af5 100644
--- a/src/creds/shibbolethcredentials.h
+++ b/src/creds/shibbolethcredentials.h
@@ -61,7 +61,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void onShibbolethCookieReceived(const QNetworkCookie&, Account*);
-    void slotBrowserAccepted();
+    void slotBrowserRejected();
     void onFetched();
     void slotReadJobDone(QKeychain::Job*);
     void slotInvalidateAndFetchInvalidateDone(QKeychain::Job*);

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