[Pkg-owncloud-commits] [owncloud-client] 13/70: Shib: Ensure browser view gets closed before QNAM

[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 4abe00ff6cac1376981282b59498bd4f651e3452
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Sat Jun 14 00:50:33 2014 +0000

    Shib: Ensure browser view gets closed before QNAM
    
    Otherwise, QWebPage tries to delete its QNetworkReplies, which have
    already been deleted by the QNAM destruction, who is their parent.
    
    Fixes #1840
---
 src/creds/shibbolethcredentials.cpp        | 2 +-
 src/wizard/owncloudshibbolethcredspage.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 55aabc0..6c01efc 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -352,7 +352,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
     }
     _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, Account*)),
-            this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*)));
+            this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*)), Qt::QueuedConnection);
     connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));
 
     _browser->show();
diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/wizard/owncloudshibbolethcredspage.cpp
index 076d741..40053d6 100644
--- a/src/wizard/owncloudshibbolethcredspage.cpp
+++ b/src/wizard/owncloudshibbolethcredspage.cpp
@@ -48,7 +48,7 @@ void OwncloudShibbolethCredsPage::setupBrowser()
 
     _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)),
-            this, SLOT(slotShibbolethCookieReceived()));
+            this, SLOT(slotShibbolethCookieReceived()), Qt::QueuedConnection);
     connect(_browser, SIGNAL(rejected()),
             this, SLOT(slotBrowserRejected()));
 

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